Skip to content

[DockWindow v2] CI. Enabled KDDockWidgets v2 by default #34240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Eism wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −9
Open

[DockWindow v2] CI. Enabled KDDockWidgets v2 by default #34240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be59a1c
updated the framework
Eism Jul 17, 2026
d96d4d1
enabled kddockwidgets v2 by default on CI
Eism Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
required: false
dockwidgets_v2:
description: 'Use KDDockWidgets v2: ON/OFF'
default: 'OFF'
default: 'ON'
required: false
workflow_call:
inputs:
Expand Down Expand Up @@ -57,7 +57,7 @@ on:
required: false
dockwidgets_v2:
description: 'Use KDDockWidgets v2: ON/OFF'
default: 'OFF'
default: 'ON'
type: string
required: false

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
required: false
dockwidgets_v2:
description: 'Use KDDockWidgets v2: ON/OFF'
default: 'OFF'
default: 'ON'
required: false
workflow_call:
inputs:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
required: false
dockwidgets_v2:
description: 'Use KDDockWidgets v2: ON/OFF'
default: 'OFF'
default: 'ON'
required: false
workflow_call:
inputs:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
required: false
dockwidgets_v2:
description: 'Use KDDockWidgets v2: ON/OFF'
default: 'OFF'
default: 'ON'
required: false
workflow_call:
inputs:
Expand Down Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ set(QT_QPROCESS_SUPPORTED ON)
set(QT_CONCURRENT_SUPPORTED ON)
set(QT_NO_PRIVATE_MODULE_WARNING ON)
set(MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE ON)
set(MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2 ON)

@coderabbitai coderabbitai Bot Jul 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

rg -n -C3 'dockwidgets_v2|MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2' CMakeLists.txt buildscripts .github/workflows

Repository: musescore/MuseScore

Length of output: 10854

🏁 Script executed:

#!/bin/bash
set -euo pipefail

printf '\n== CMake context ==\n'
sed -n '180,220p' CMakeLists.txt

printf '\n== Linux build script ==\n'
sed -n '1,140p' buildscripts/ci/linux/build.sh

printf '\n== macOS build script ==\n'
sed -n '1,100p' buildscripts/ci/macos/build.sh

printf '\n== Windows build script ==\n'
sed -n '1,80p' buildscripts/ci/windows/build.bat

printf '\n== Search for direct CMake -D forwarding ==\n'
rg -n -C2 'MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2|dockwidgets_v2|cmake .* -D| -D[Mm]USE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2' buildscripts .github/workflows CMakeLists.txt

Repository: musescore/MuseScore

Length of output: 19364

🏁 Script executed:

#!/bin/bash
set -euo pipefail

printf '\n== Variable usage ==\n'
rg -n -C3 'MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2|MUSESCORE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2|dockwidgets_v2' . --glob '!build*' --glob '!**/node_modules/**'

printf '\n== SetupConfigure file candidates ==\n'
fd -a 'SetupConfigure*' .

printf '\n== SetupConfigure outline if present ==\n'
for f in $(fd -a 'SetupConfigure*' .); do
  printf '\n--- %s ---\n' "$f"
  wc -l "$f"
  sed -n '1,220p' "$f"
done

Repository: musescore/MuseScore

Length of output: 9081

Preserve explicit OFF overrides. ninja_build.sh forwards MUSESCORE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2 as -DMUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2=..., so the unconditional set(MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2 ON) at CMakeLists.txt:195 shadows a requested OFF. Guard it with if(NOT DEFINED ...) or switch to a cache default.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@CMakeLists.txt` at line 195, Update the
MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2 setting so it defaults to ON only when
the variable is not already defined, preserving explicit OFF values passed by
ninja_build.sh. Use a NOT DEFINED guard or an equivalent cache default around
this setting.


if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SetupConfigure.local.cmake")
include(${CMAKE_CURRENT_LIST_DIR}/SetupConfigure.local.cmake)
Expand Down
2 changes: 1 addition & 1 deletion muse
Open in desktop
Submodule muse updated 16 files
+1 −1 framework/audioplugins/internal/registeraudiopluginsscenario.cpp
+1 −1 framework/audioplugins/tests/registeraudiopluginsscenariotest.cpp
+4 −0 framework/dockwindow_v2/CMakeLists.txt
+7 −1 framework/dockwindow_v2/internal/dockbase.cpp
+1 −0 framework/dockwindow_v2/internal/dockbase.h
+2 −0 framework/dockwindow_v2/qml/Muse/Dock/CMakeLists.txt
+1 −1 framework/dockwindow_v2/qml/Muse/Dock/dockframemodel.cpp
+12 −273 framework/dockwindow_v2/qml/Muse/Dock/dockwindow.cpp
+5 −14 framework/dockwindow_v2/qml/Muse/Dock/dockwindow.h
+290 −0 framework/dockwindow_v2/qml/Muse/Dock/topleveltoolbarslayout.cpp
+64 −0 framework/dockwindow_v2/qml/Muse/Dock/topleveltoolbarslayout.h
+40 −0 framework/dockwindow_v2/tests/CMakeLists.txt
+530 −0 framework/dockwindow_v2/tests/topleveltoolbarslayout_tests.cpp
+14 −0 framework/global/types/uri.cpp
+11 −1 framework/global/types/uri.h
+2 −0 framework/ui/view/iconcodes.h
Loading