diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 1b23c77fb90d4..bbb2bb3ab8b24 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -26,7 +26,7 @@ on: required: false dockwidgets_v2: description: 'Use KDDockWidgets v2: ON/OFF' - default: 'OFF' + default: 'ON' required: false workflow_call: inputs: @@ -57,7 +57,7 @@ on: required: false dockwidgets_v2: description: 'Use KDDockWidgets v2: ON/OFF' - default: 'OFF' + default: 'ON' type: string required: false diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 2e590b0ece8bc..57d69b67cc015 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -22,7 +22,7 @@ on: required: false dockwidgets_v2: description: 'Use KDDockWidgets v2: ON/OFF' - default: 'OFF' + default: 'ON' required: false workflow_call: inputs: @@ -53,7 +53,7 @@ on: required: false dockwidgets_v2: description: 'Use KDDockWidgets v2: ON/OFF' - default: 'OFF' + default: 'ON' type: string required: false app_repo: diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 1f34943fa68b0..39b4dc00b2590 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -18,7 +18,7 @@ on: required: false dockwidgets_v2: description: 'Use KDDockWidgets v2: ON/OFF' - default: 'OFF' + default: 'ON' required: false workflow_call: inputs: @@ -44,7 +44,7 @@ on: required: false dockwidgets_v2: description: 'Use KDDockWidgets v2: ON/OFF' - default: 'OFF' + default: 'ON' type: string required: false app_repo: diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 86da5a2328ccb..fae1b3b9b2c12 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -22,7 +22,7 @@ on: required: false dockwidgets_v2: description: 'Use KDDockWidgets v2: ON/OFF' - default: 'OFF' + default: 'ON' required: false workflow_call: inputs: @@ -53,7 +53,7 @@ on: required: false dockwidgets_v2: description: 'Use KDDockWidgets v2: ON/OFF' - default: 'OFF' + default: 'ON' type: string required: false app_repo: diff --git a/CMakeLists.txt b/CMakeLists.txt index f7097712a503a..aee6837c9d8b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,6 +193,10 @@ set(QT_CONCURRENT_SUPPORTED ON) set(QT_NO_PRIVATE_MODULE_WARNING ON) set(MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE ON) +if(NOT MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2) + set(MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2 ON) +endif() + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SetupConfigure.local.cmake") include(${CMAKE_CURRENT_LIST_DIR}/SetupConfigure.local.cmake) else() diff --git a/muse b/muse index 5ded6c34e9fb3..d4bd027592dce 160000 --- a/muse +++ b/muse @@ -1 +1 @@ -Subproject commit 5ded6c34e9fb362cf9307ba5415d89188612b327 +Subproject commit d4bd027592dce0e180ca8a0f3c9a3817bfd74e1c diff --git a/ninja_build.sh b/ninja_build.sh index 233cc3287a704..76915c013c9ed 100755 --- a/ninja_build.sh +++ b/ninja_build.sh @@ -48,7 +48,7 @@ MUSESCORE_MODULE_UPDATE=${MUSESCORE_MODULE_UPDATE:-"ON"} MUSESCORE_BUILD_VST_MODULE=${MUSESCORE_BUILD_VST_MODULE:-"OFF"} MUSESCORE_BUILD_WEBSOCKET=${MUSESCORE_BUILD_WEBSOCKET:-"OFF"} MUSESCORE_BUILD_PIPEWIRE_AUDIO_DRIVER=${MUSESCORE_BUILD_PIPEWIRE_AUDIO_DRIVER:-"OFF"} -MUSESCORE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2=${MUSESCORE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2:-"OFF"} +MUSESCORE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2=${MUSESCORE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2:-"ON"} MUSESCORE_COMPILE_USE_UNITY=${MUSESCORE_COMPILE_USE_UNITY:-"ON"} SHOW_HELP=0