Merge pull request #13334 from fwcd/fix-macos-qml-build

Fix QML build regressions on macOS
mixxxdj · Jun 7, 2024 · 91e16fa · 91e16fa
2 parents 8be2e89 + 0ccf1c1
commit 91e16fa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -72,7 +72,7 @@ jobs:
               -DMACOS_BUNDLE=ON
               -DMODPLUG=ON
               -DQT6=ON
-              -DQML=OFF
+              -DQML=ON
               -DWAVPACK=ON
               -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100-release
               -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1100-release

diff --git a/src/controllers/rendering/controllerrenderingengine.h b/src/controllers/rendering/controllerrenderingengine.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <GL/gl.h>
-
 #include <QObject>
+#include <QOpenGLContext>
+#include <QOpenGLFramebufferObject>
 #include <chrono>
 #include <gsl/pointers>
 

diff --git a/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp b/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp
@@ -7,12 +7,6 @@
 #include <QQuickWindow>
 #include <QtEndian>
 #include <algorithm>
-
-// Prevent conflict with methods called 'emit' in <execution> source
-#pragma push_macro("emit")
-#undef emit
-#include <execution>
-#pragma pop_macro("emit")
 #endif
 
 #include "control/controlobject.h"
@@ -323,7 +317,7 @@ void ControllerScriptEngineLegacy::setScriptFiles(
     m_scriptFiles = scripts;
 
 #ifdef MIXXX_USE_QML
-    setQMLMode(std::any_of(std::execution::par_unseq,
+    setQMLMode(std::any_of(
             m_scriptFiles.cbegin(),
             m_scriptFiles.cend(),
             [](const auto& scriptFileInfo) {
@@ -660,7 +654,9 @@ void ControllerScriptEngineLegacy::handleScreenFrame(
         emit previewRenderedScreen(screenInfo, screenDebug);
     }
 
-    QByteArray input(std::bit_cast<const char*>(frame.constBits()), frame.sizeInBytes());
+    // TODO: Refactor this to a `std::bit_cast` once we drop support for older
+    // compilers that don't support it (e.g. older than Xcode 14.3/macOS 13)
+    QByteArray input(reinterpret_cast<const char*>(frame.constBits()), frame.sizeInBytes());
     const TransformScreenFrameFunction& transformMethod =
             m_transformScreenFrameFunctions[screenInfo.identifier];