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

14 files changed, 33 insertions, 7 deletions

diff --git a/src/control/control.cpp b/src/control/control.cpp
index 6f988913f3..5ea6a51dad 100644
--- a/src/control/control.cpp
+++ b/src/control/control.cpp
@@ -1,6 +1,7 @@
 #include "control/control.h"
 
 #include "control/controlobject.h"
+#include "moc_control.cpp"
 #include "util/stat.h"
 
 //static
diff --git a/src/control/controlaudiotaperpot.cpp b/src/control/controlaudiotaperpot.cpp
index 9264b67774..d5f8000a10 100644
--- a/src/control/controlaudiotaperpot.cpp
+++ b/src/control/controlaudiotaperpot.cpp
@@ -1,6 +1,8 @@
 
 #include "control/controlaudiotaperpot.h"
 
+#include "moc_controlaudiotaperpot.cpp"
+
 ControlAudioTaperPot::ControlAudioTaperPot(const ConfigKey& key,
         double minDB,
         double maxDB,
diff --git a/src/control/controleffectknob.cpp b/src/control/controleffectknob.cpp
index cf01306458..1dfd28d592 100644
--- a/src/control/controleffectknob.cpp
+++ b/src/control/controleffectknob.cpp
@@ -1,7 +1,8 @@
 #include "control/controleffectknob.h"
 
-#include "util/math.h"
 #include "effects/effectmanifestparameter.h"
+#include "moc_controleffectknob.cpp"
+#include "util/math.h"
 
 ControlEffectKnob::ControlEffectKnob(const ConfigKey& key, double dMinValue, double dMaxValue)
         : ControlPotmeter(key, dMinValue, dMaxValue) {
diff --git a/src/control/controlencoder.cpp b/src/control/controlencoder.cpp
index 3dd146a6e9..be9b6893ab 100644
--- a/src/control/controlencoder.cpp
+++ b/src/control/controlencoder.cpp
@@ -1,5 +1,7 @@
 #include "control/controlencoder.h"
 
+#include "moc_controlencoder.cpp"
+
 ControlEncoder::ControlEncoder(const ConfigKey& key, bool bIgnoreNops)
         : ControlObject(key, bIgnoreNops) {
     if (m_pControl) {
diff --git a/src/control/controlindicator.cpp b/src/control/controlindicator.cpp
index 2d655b02b0..3dc77a108a 100644
--- a/src/control/controlindicator.cpp
+++ b/src/control/controlindicator.cpp
@@ -1,5 +1,7 @@
 #include "control/controlindicator.h"
+
 #include "control/controlproxy.h"
+#include "moc_controlindicator.cpp"
 #include "util/math.h"
 
 ControlIndicator::ControlIndicator(const ConfigKey& key)
diff --git a/src/control/controllinpotmeter.cpp b/src/control/controllinpotmeter.cpp
index deaa65f91a..72a2fc721d 100644
--- a/src/control/controllinpotmeter.cpp
+++ b/src/control/controllinpotmeter.cpp
@@ -1,5 +1,7 @@
 #include "control/controllinpotmeter.h"
 
+#include "moc_controllinpotmeter.cpp"
+
 ControlLinPotmeter::ControlLinPotmeter(const ConfigKey& key,
         double dMinValue,
         double dMaxValue,
diff --git a/src/control/controllogpotmeter.cpp b/src/control/controllogpotmeter.cpp
index b0c4e40163..ad84a38380 100644
--- a/src/control/controllogpotmeter.cpp
+++ b/src/control/controllogpotmeter.cpp
@@ -17,6 +17,8 @@
 
 #include "control/controllogpotmeter.h"
 
+#include "moc_controllogpotmeter.cpp"
+
 ControlLogpotmeter::ControlLogpotmeter(const ConfigKey& key, double dMaxValue, double minDB)
         : ControlPotmeter(key, 0, dMaxValue) {
     // Override ControlPotmeters default value of 0.5
diff --git a/src/control/controlmodel.cpp b/src/control/controlmodel.cpp
index 923be754b2..33824eb52f 100644
--- a/src/control/controlmodel.cpp
+++ b/src/control/controlmodel.cpp
@@ -1,5 +1,7 @@
 #include "control/controlmodel.h"
 
+#include "moc_controlmodel.cpp"
+
 ControlModel::ControlModel(QObject* pParent)
         : QAbstractTableModel(pParent) {
 
diff --git a/src/control/controlobject.cpp b/src/control/controlobject.cpp
index 5aa71b84ce..98736f6138 100644
--- a/src/control/controlobject.cpp
+++ b/src/control/controlobject.cpp
@@ -15,13 +15,15 @@
 *                                                                         *
 ***************************************************************************/
 
-#include <QtDebug>
+#include "control/controlobject.h"
+
 #include <QHash>
-#include <QSet>
 #include <QMutexLocker>
+#include <QSet>
+#include <QtDebug>
 
-#include "control/controlobject.h"
 #include "control/control.h"
+#include "moc_controlobject.cpp"
 #include "util/stat.h"
 #include "util/timer.h"
 
diff --git a/src/control/controlobjectscript.cpp b/src/control/controlobjectscript.cpp
index bccaacdeb6..db11155d58 100644
--- a/src/control/controlobjectscript.cpp
+++ b/src/control/controlobjectscript.cpp
@@ -1,6 +1,8 @@
+#include "control/controlobjectscript.h"
+
 #include <QtDebug>
 
-#include "control/controlobjectscript.h"
+#include "moc_controlobjectscript.cpp"
 
 ControlObjectScript::ControlObjectScript(const ConfigKey& key, QObject* pParent)
         : ControlProxy(key, pParent, ControlFlag::NoAssertIfMissing) {
diff --git a/src/control/controlpotmeter.cpp b/src/control/controlpotmeter.cpp
index a62b77ef43..667358f7aa 100644
--- a/src/control/controlpotmeter.cpp
+++ b/src/control/controlpotmeter.cpp
@@ -15,9 +15,11 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "control/controlpushbutton.h"
 #include "control/controlpotmeter.h"
+
 #include "control/controlproxy.h"
+#include "control/controlpushbutton.h"
+#include "moc_controlpotmeter.cpp"
 
 ControlPotmeter::ControlPotmeter(const ConfigKey& key,
         double dMinValue,
diff --git a/src/control/controlproxy.cpp b/src/control/controlproxy.cpp
index 5ca1f04630..51e7876f1a 100644
--- a/src/control/controlproxy.cpp
+++ b/src/control/controlproxy.cpp
@@ -1,7 +1,9 @@
+#include "control/controlproxy.h"
+
 #include <QtDebug>
 
-#include "control/controlproxy.h"
 #include "control/control.h"
+#include "moc_controlproxy.cpp"
 
 ControlProxy::ControlProxy(const QString& g, const QString& i, QObject* pParent, ControlFlags flags)
         : ControlProxy(ConfigKey(g, i), pParent, flags) {
diff --git a/src/control/controlpushbutton.cpp b/src/control/controlpushbutton.cpp
index 29c4e9dd9b..e4a9200b41 100644
--- a/src/control/controlpushbutton.cpp
+++ b/src/control/controlpushbutton.cpp
@@ -17,6 +17,8 @@
 
 #include "control/controlpushbutton.h"
 
+#include "moc_controlpushbutton.cpp"
+
 /* -------- ------------------------------------------------------
    Purpose: Creates a new simulated latching push-button.
    Input:   key - Key for the configuration file
diff --git a/src/control/controlttrotary.cpp b/src/control/controlttrotary.cpp
index 930c8c48d6..cb0961ac9f 100644
--- a/src/control/controlttrotary.cpp
+++ b/src/control/controlttrotary.cpp
@@ -16,6 +16,8 @@
 
 #include "control/controlttrotary.h"
 
+#include "moc_controlttrotary.cpp"
+
 /* -------- ------------------------------------------------------
    Purpose: Creates a new rotary encoder
    Input:   key