Merge remote-tracking branch 'upstream/2.4' into main

mixxxdj · Nov 15, 2023 · c1665e5 · c1665e5
2 parents 650b5da + b8c1a44
commit c1665e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/src/effects/backends/effectsbackend.cpp b/src/effects/backends/effectsbackend.cpp
@@ -1,5 +1,7 @@
 #include "effects/backends/effectsbackend.h"
 
+#include <QObject>
+
 namespace {
 const QString backendTypeNameLV2 = QStringLiteral("LV2");
 // QString::tr requires const char[] rather than QString

diff --git a/src/effects/visibleeffectslist.h b/src/effects/visibleeffectslist.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QList>
+#include <QObject>
 
 #include "effects/defs.h"
 

diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp
@@ -13,6 +13,7 @@
 #include "library/libraryview.h"
 #include "mixer/playermanager.h"
 #include "moc_librarycontrol.cpp"
+#include "util/cmdlineargs.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
 #include "widget/wsearchlineedit.h"

diff --git a/src/util/parented_ptr.h b/src/util/parented_ptr.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
+#include <QObject>
+#endif
 #include <QPointer>
 #include <memory>