diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ee672ead1..f7e248ce8 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -130,10 +130,7 @@ jobs: - name: Deploy Qt dependencies run: | export PATH="$(brew --prefix qt@6)/bin:$PATH" - macdeployqt build/app/Oak.app \ - -qmldir=app \ - -qmldir=ext/KDDockWidgets/src/qtquick/views/qml \ - -verbose=2 + macdeployqt build/app/Oak.app # Re-sign after macdeployqt (it breaks signatures when modifying libs) codesign --force --deep --sign - build/app/Oak.app diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index 135d557c3..448a97685 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -18,4 +18,7 @@ add_subdirectory(core EXCLUDE_FROM_ALL) set(KDDockWidgets_STATIC ON CACHE INTERNAL "Force KDDockWidgets to build statically") set(KDDockWidgets_QT6 ${BUILD_QT6} CACHE INTERNAL "Conform KDDockWidgets' Qt 6 setting to ours") +# Oak only uses the QtWidgets frontend; building the QtQuick frontend causes +# duplicate QML module registration on macOS and pulls in unused dependencies. +set(KDDockWidgets_FRONTENDS "qtwidgets" CACHE INTERNAL "Only build the QtWidgets frontend for Oak") add_subdirectory(KDDockWidgets EXCLUDE_FROM_ALL)