diff --git a/src/plugins/cppeditor/CMakeLists.txt b/src/plugins/cppeditor/CMakeLists.txt
index 1756e996892..d00f428375b 100644
--- a/src/plugins/cppeditor/CMakeLists.txt
+++ b/src/plugins/cppeditor/CMakeLists.txt
@@ -33,7 +33,6 @@ add_qtc_plugin(CppEditor
     cppcompletionassistprovider.cpp cppcompletionassistprovider.h
     cppcursorinfo.h
     cppdoxygen.cpp cppdoxygen.h
-    cppeditor.qrc
     cppeditor_global.h
     cppeditortr.h
     cppeditorconstants.h
@@ -169,6 +168,14 @@ extend_qtc_plugin(CppEditor
     quickfixes/cppquickfix_test.h
 )
 
+qtc_add_resources(CppEditor "images"
+  PREFIX "/cppeditor"
+  BASE "."
+  FILES
+    images/dark_qt_c.png
+    images/dark_qt_cpp.png
+    images/dark_qt_h.png
+)
 file(GLOB_RECURSE test_cases RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} testcases/*)
 qtc_add_resources(CppEditor "testcases"
   CONDITION WITH_TESTS
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 5d7e46d63c1..8b94ba1a255 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -24,7 +24,8 @@ QtcPlugin {
         cpp.defines: "_SCL_SECURE_NO_WARNINGS"
     }
 
-    Qt.core.resourceFileBaseName: "cppeditor_testdata"
+    Qt.core.resourcePrefix: "cppeditor"
+    Qt.core.resourceSourceBase: sourceDirectory
 
     files: [
         "abstracteditorsupport.cpp",
@@ -90,7 +91,6 @@ QtcPlugin {
         "cppeditorlogging.h",
         "cppeditorwidget.cpp",
         "cppeditorwidget.h",
-        "cppeditor.qrc",
         "cppeditor_global.h",
         "cppeditortr.h",
         "cppeditorconstants.h",
@@ -359,8 +359,17 @@ QtcPlugin {
         name: "test data"
         files: "testcases/**/*"
         fileTags: qtc.withPluginTests ? ["qt.core.resource_data"] : []
-        Qt.core.resourcePrefix: "cppeditor"
-        Qt.core.resourceSourceBase: sourceDirectory
+    }
+
+    Group {
+        name: "images"
+        prefix: "images/"
+        files: [
+            "dark_qt_cpp.png",
+            "dark_qt_h.png",
+            "dark_qt_c.png",
+        ]
+        fileTags: "qt.core.resource_data"
     }
 
     Export {
diff --git a/src/plugins/cppeditor/cppeditor.qrc b/src/plugins/cppeditor/cppeditor.qrc
deleted file mode 100644
index b66e10aeed6..00000000000
--- a/src/plugins/cppeditor/cppeditor.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-<RCC>
-    <qresource prefix="/cppeditor">
-        <file>images/dark_qt_cpp.png</file>
-        <file>images/dark_qt_h.png</file>
-        <file>images/dark_qt_c.png</file>
-    </qresource>
-</RCC>