Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main

# Conflicts:
#	src/controllers/colormapperjsproxy.cpp
#	src/controllers/engine/controllerengine.cpp
#	src/controllers/hid/hidcontroller.cpp
#	src/database/mixxxdb.cpp
#	src/library/crate/cratetablemodel.cpp
#	src/library/dao/trackdao.cpp
#	src/library/hiddentablemodel.cpp
#	src/library/library.cpp
#	src/library/playlisttablemodel.cpp
#	src/library/trackset/baseplaylistfeature.cpp
#	src/library/trackset/crate/cratefeaturehelper.cpp
#	src/mixxxapplication.cpp
#	src/network/jsonwebtask.cpp
#	src/preferences/dialog/dlgpreferences.cpp
#	src/recording/recordingmanager.cpp
#	src/track/track.cpp
#	src/widget/wsearchlineedit.cpp

1 files changed, 2 insertions, 0 deletions

diff --git a/src/mixer/deck.cpp b/src/mixer/deck.cpp
index 98cb446634..06be4a5bbf 100644
--- a/src/mixer/deck.cpp
+++ b/src/mixer/deck.cpp
@@ -1,5 +1,7 @@
 #include "mixer/deck.h"
 
+#include "moc_deck.cpp"
+
 Deck::Deck(QObject* pParent,
         UserSettingsPointer pConfig,
         EngineMaster* pMixingEngine,