diff --git a/src/plugins/debugger/CMakeLists.txt b/src/plugins/debugger/CMakeLists.txt
index 672957c01e2..1a7701284ab 100644
--- a/src/plugins/debugger/CMakeLists.txt
+++ b/src/plugins/debugger/CMakeLists.txt
@@ -28,7 +28,6 @@ add_qtc_plugin(Debugger
dap/gdbdapengine.cpp dap/gdbdapengine.h
dap/lldbdapengine.cpp dap/lldbdapengine.h
dap/pydapengine.cpp dap/pydapengine.h
- debugger.qrc
debugger_global.h
debuggeractions.cpp debuggeractions.h
debuggerconstants.h
@@ -106,9 +105,16 @@ extend_qtc_plugin(Debugger
DEFINES UNICODE _UNICODE
)
-extend_qtc_plugin(Debugger
- CONDITION WITH_TESTS
- SOURCES
- debuggerunittests.qrc
- unit-tests/simple/main.cpp
+file(GLOB_RECURSE images RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} images/*)
+qtc_add_resources(Debugger "images"
+ PREFIX "/debugger"
+ BASE "."
+ FILES ${images}
+)
+file(GLOB_RECURSE test_cases RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} unit-tests/*)
+qtc_add_resources(Debugger "testcases"
+ CONDITION WITH_TESTS
+ PREFIX "/debugger"
+ BASE "."
+ FILES ${test_cases}
)
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index ae4ff3c6a94..f664652131f 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -23,13 +23,15 @@ QtcPlugin {
cpp.includePaths: base.concat([project.sharedSourcesDir + "/registryaccess"])
cpp.enableExceptions: true
+ Qt.core.resourcePrefix: "debugger"
+ Qt.core.resourceSourceBase: sourceDirectory
+
Group {
name: "General"
files: [
"breakhandler.cpp", "breakhandler.h",
"breakpoint.cpp", "breakpoint.h",
"commonoptionspage.cpp", "commonoptionspage.h",
- "debugger.qrc",
"debugger_global.h", "debuggertr.h",
"debuggeractions.cpp", "debuggeractions.h",
"debuggerconstants.h",
@@ -179,18 +181,6 @@ QtcPlugin {
]
}
- Group {
- name: "Images"
- prefix: "images/"
- files: ["*.png"]
- }
-
- Group {
- name: "Images/qml"
- prefix: "images/qml/"
- files: ["*.png"]
- }
-
Group {
name: "RegistryAccess"
condition: qbs.targetOS.contains("windows")
@@ -229,19 +219,19 @@ QtcPlugin {
]
}
- QtcTestFiles {
- files: [
- "debuggerunittests.qrc",
- ]
- }
-
Group {
name: "Unit test resources"
prefix: "unit-tests/"
- fileTags: []
+ fileTags: qtc.withPluginTests ? ["qt.core.resource_data"] : []
files: ["**/*"]
}
+ Group {
+ name: "images"
+ files: "images/*.png"
+ fileTags: "qt.core.resource_data"
+ }
+
Export {
Depends { name: "CPlusPlus" }
}
diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
deleted file mode 100644
index aed1d886193..00000000000
--- a/src/plugins/debugger/debugger.qrc
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
- images/settingscategory_analyzer.png
- images/settingscategory_analyzer@2x.png
- images/settingscategory_debugger.png
- images/settingscategory_debugger@2x.png
- images/debugger_breakpoints.png
- images/debugger_continue.png
- images/debugger_continue@2x.png
- images/debugger_continue_1_mask.png
- images/debugger_continue_1_mask@2x.png
- images/debugger_continue_2_mask.png
- images/debugger_continue_2_mask@2x.png
- images/debugger_empty_14.png
- images/debugger_interrupt.png
- images/debugger_interrupt@2x.png
- images/debugger_interrupt_mask.png
- images/debugger_interrupt_mask@2x.png
- images/debugger_stop.png
- images/debugger_stop@2x.png
- images/debugger_stop_mask.png
- images/debugger_stop_mask@2x.png
- images/debugger_reversemode.png
- images/debugger_reversemode@2x.png
- images/debugger_reversemode_background.png
- images/debugger_reversemode_background@2x.png
- images/debugger_singleinstructionmode.png
- images/debugger_singleinstructionmode@2x.png
- images/debugger_stepinto_small.png
- images/debugger_stepinto_small@2x.png
- images/debugger_stepout_small.png
- images/debugger_stepout_small@2x.png
- images/debugger_stepover_small.png
- images/debugger_stepover_small@2x.png
- images/breakpoint_disabled.png
- images/breakpoint_disabled@2x.png
- images/breakpoint_pending_overlay.png
- images/breakpoint_pending_overlay@2x.png
- images/location.png
- images/location@2x.png
- images/location_background.png
- images/location_background@2x.png
- images/mode_debug.png
- images/mode_debug@2x.png
- images/mode_debug_mask.png
- images/mode_debug_mask@2x.png
- images/debugger_restart_small.png
- images/debugger_restart_small@2x.png
- images/recordfill.png
- images/recordfill@2x.png
- images/recordoutline.png
- images/recordoutline@2x.png
- images/tracepointoverlay.png
- images/tracepointoverlay@2x.png
- images/macos_touchbar_debug.png
- images/macos_touchbar_debug@2x.png
- images/macos_touchbar_debug_continue.png
- images/macos_touchbar_debug_continue@2x.png
- images/macos_touchbar_debug_interrupt.png
- images/macos_touchbar_debug_interrupt@2x.png
- images/macos_touchbar_debug_exit.png
- images/macos_touchbar_debug_exit@2x.png
- images/macos_touchbar_debug_step_into.png
- images/macos_touchbar_debug_step_into@2x.png
- images/macos_touchbar_debug_step_out.png
- images/macos_touchbar_debug_step_out@2x.png
- images/macos_touchbar_debug_step_over.png
- images/macos_touchbar_debug_step_over@2x.png
-
-
diff --git a/src/plugins/debugger/debuggerunittests.qrc b/src/plugins/debugger/debuggerunittests.qrc
deleted file mode 100644
index d00ec930f5c..00000000000
--- a/src/plugins/debugger/debuggerunittests.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- unit-tests/simple/main.cpp
- unit-tests/simple/simple.pro
-
-