diff --git a/src/plugins/scxmleditor/CMakeLists.txt b/src/plugins/scxmleditor/CMakeLists.txt index 638f5391349..5ff60e9a507 100644 --- a/src/plugins/scxmleditor/CMakeLists.txt +++ b/src/plugins/scxmleditor/CMakeLists.txt @@ -8,7 +8,6 @@ add_qtc_plugin(ScxmlEditor common/colorthemes.cpp common/colorthemes.h common/colorthemeview.cpp common/colorthemeview.h common/colortoolbutton.cpp common/colortoolbutton.h - common/common.qrc common/dragshapebutton.cpp common/dragshapebutton.h common/graphicsview.cpp common/graphicsview.h common/magnifier.cpp common/magnifier.h @@ -92,3 +91,10 @@ add_qtc_plugin(ScxmlEditor scxmleditorplugin.cpp scxmltexteditor.cpp scxmltexteditor.h ) + +file(GLOB_RECURSE images RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/common common/images/*) +qtc_add_resources(ScxmlEditor "images" + PREFIX "/scxmleditor" + FILES_PREFIX "common" + FILES ${images} +) diff --git a/src/plugins/scxmleditor/common/common.qrc b/src/plugins/scxmleditor/common/common.qrc deleted file mode 100644 index a8341194cfa..00000000000 --- a/src/plugins/scxmleditor/common/common.qrc +++ /dev/null @@ -1,55 +0,0 @@ - - - images/adjust_height.png - images/adjust_height@2x.png - images/adjust_size.png - images/adjust_size@2x.png - images/adjust_width.png - images/adjust_width@2x.png - images/align_bottom.png - images/align_bottom@2x.png - images/align_horizontal.png - images/align_horizontal@2x.png - images/align_left.png - images/align_left@2x.png - images/align_right.png - images/align_right@2x.png - images/align_top.png - images/align_top@2x.png - images/align_vertical.png - images/align_vertical@2x.png - images/colorthemes.png - images/colorthemes@2x.png - images/fill.png - images/fill@2x.png - images/font_color.png - images/font_color@2x.png - images/history.png - images/history@2x.png - images/icon-export-canvas.png - images/icon-export-canvas@2x.png - images/innerFill.png - images/innerFill@2x.png - images/midRing.png - images/midRing@2x.png - images/more_colors.png - images/navigator.png - images/navigator@2x.png - images/navigator_fill.png - images/navigator_fill@2x.png - images/outerRing.png - images/outerRing@2x.png - images/parallel_icon.png - images/parallel_icon@2x.png - images/state.png - images/state@2x.png - images/statistics.png - images/statistics@2x.png - images/theme1_fill.png - images/theme1_fill@2x.png - images/theme2_fill.png - images/theme2_fill@2x.png - images/theme3_fill.png - images/theme3_fill@2x.png - - diff --git a/src/plugins/scxmleditor/scxmleditor.qbs b/src/plugins/scxmleditor/scxmleditor.qbs index cf09b83625a..fa21362c7f5 100644 --- a/src/plugins/scxmleditor/scxmleditor.qbs +++ b/src/plugins/scxmleditor/scxmleditor.qbs @@ -63,9 +63,15 @@ QtcPlugin { "structure.cpp", "structure.h", "structuremodel.cpp", "structuremodel.h", "treeview.h", "treeview.cpp", - - "common.qrc", ] + + Group { + name: "images" + files: "images/*.png" + fileTags: "qt.core.resource_data" + Qt.core.resourcePrefix: "/scxmleditor" + Qt.core.resourceSourceBase: product.sourceDirectory + "/common" + } } Group {