Merge branch 'master' into features_key

Conflicts:
	build/depends.py
	src/audiotagger.cpp
	src/basetrackplayer.cpp
	src/basetrackplayer.h
	src/dlgpreferences.cpp
	src/dlgpreferences.h
	src/engine/enginebuffer.cpp
	src/engine/enginebuffer.h
	src/engine/enginebufferscalelinear.cpp
	src/engine/enginebufferscalest.cpp
	src/library/cratetablemodel.cpp
	src/library/dao/trackdao.cpp
	src/library/librarytablemodel.cpp
	src/trackinfoobject.cpp

1 files changed, 2 insertions, 1 deletions

diff --git a/src/dlgprefbeats.h b/src/dlgprefbeats.h
index 65d401a467..08fb293fa9 100644
--- a/src/dlgprefbeats.h
+++ b/src/dlgprefbeats.h
@@ -12,8 +12,9 @@
 #include "ui_dlgprefbeatsdlg.h"
 #include "vamp/vamppluginloader.h"
 #include "configobject.h"
+#include "preferences/dlgpreferencepage.h"
 
-class DlgPrefBeats : public QWidget, public Ui::DlgBeatsDlg {
+class DlgPrefBeats : public DlgPreferencePage, public Ui::DlgBeatsDlg {
     Q_OBJECT
   public:
     DlgPrefBeats(QWidget *parent, ConfigObject<ConfigValue> *_config);