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

2 files changed, 2 insertions, 0 deletions

diff --git a/src/network/jsonwebtask.cpp b/src/network/jsonwebtask.cpp
index 7f566e7168..d959149aa3 100644
--- a/src/network/jsonwebtask.cpp
+++ b/src/network/jsonwebtask.cpp
@@ -6,6 +6,7 @@
 #include <QTimerEvent>
 #include <mutex> // std::once_flag
 
+#include "moc_jsonwebtask.cpp"
 #include "util/counter.h"
 #include "util/logger.h"
 #include "util/thread_affinity.h"
diff --git a/src/network/webtask.cpp b/src/network/webtask.cpp
index 49cc3fc819..534c582b22 100644
--- a/src/network/webtask.cpp
+++ b/src/network/webtask.cpp
@@ -3,6 +3,7 @@
 #include <QTimerEvent>
 #include <mutex> // std::once_flag
 
+#include "moc_webtask.cpp"
 #include "util/assert.h"
 #include "util/counter.h"
 #include "util/logger.h"