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/library/banshee/bansheefeature.cpp b/src/library/banshee/bansheefeature.cpp
index ee6f9a8333..faed634666 100644
--- a/src/library/banshee/bansheefeature.cpp
+++ b/src/library/banshee/bansheefeature.cpp
@@ -10,6 +10,7 @@
 #include "library/dao/settingsdao.h"
 #include "library/library.h"
 #include "library/trackcollectionmanager.h"
+#include "moc_bansheefeature.cpp"
 #include "track/track.h"
 
 const QString BansheeFeature::BANSHEE_MOUNT_KEY = "mixxx.BansheeFeature.mount";
diff --git a/src/library/banshee/bansheeplaylistmodel.cpp b/src/library/banshee/bansheeplaylistmodel.cpp
index 19cb1b028e..3633d2ae83 100644
--- a/src/library/banshee/bansheeplaylistmodel.cpp
+++ b/src/library/banshee/bansheeplaylistmodel.cpp
@@ -8,6 +8,7 @@
 #include "library/starrating.h"
 #include "library/trackcollectionmanager.h"
 #include "mixer/playermanager.h"
+#include "moc_bansheeplaylistmodel.cpp"
 #include "track/beatfactory.h"
 #include "track/beats.h"
 #include "track/track.h"