diff --git a/src/libs/modelinglib/CMakeLists.txt b/src/libs/modelinglib/CMakeLists.txt index fcead64fd01..64992d8fb48 100644 --- a/src/libs/modelinglib/CMakeLists.txt +++ b/src/libs/modelinglib/CMakeLists.txt @@ -137,7 +137,7 @@ add_qtc_library(Modeling qmt/model_widgets_ui/propertiesviewmview.cpp qmt/model_widgets_ui/propertiesviewmview.h qmt/project_controller/projectcontroller.cpp qmt/project_controller/projectcontroller.h qmt/project/project.cpp qmt/project/project.h - qmt/resources/resources.qrc + qmt/resources/resources_modelinglib.qrc qmt/serializer/diagramserializer.cpp qmt/serializer/diagramserializer.h qmt/serializer/infrastructureserializer.cpp qmt/serializer/infrastructureserializer.h qmt/serializer/modelserializer.cpp qmt/serializer/modelserializer.h diff --git a/src/libs/modelinglib/modelinglib.qbs b/src/libs/modelinglib/modelinglib.qbs index b9ee382bbdf..f6ccb200971 100644 --- a/src/libs/modelinglib/modelinglib.qbs +++ b/src/libs/modelinglib/modelinglib.qbs @@ -354,7 +354,7 @@ QtcLibrary { name: "Images" prefix: "./qmt/resources/" files: [ - "resources.qrc", + "resources_modelinglib.qrc", "25x25/align-bottom.png", "25x25/align-horizontal.png", "25x25/align-left.png", diff --git a/src/libs/modelinglib/qmt/resources/resources.qrc b/src/libs/modelinglib/qmt/resources/resources_modelinglib.qrc similarity index 100% rename from src/libs/modelinglib/qmt/resources/resources.qrc rename to src/libs/modelinglib/qmt/resources/resources_modelinglib.qrc diff --git a/src/libs/qmleditorwidgets/CMakeLists.txt b/src/libs/qmleditorwidgets/CMakeLists.txt index b33a7bd075b..e13e8b1a7b0 100644 --- a/src/libs/qmleditorwidgets/CMakeLists.txt +++ b/src/libs/qmleditorwidgets/CMakeLists.txt @@ -18,5 +18,5 @@ add_qtc_library(QmlEditorWidgets gradientline.cpp gradientline.h huecontrol.cpp huecontrol.h qmleditorwidgets_global.h - resources.qrc + resources_qmleditorwidgets.qrc ) diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs index e4dd0f773d2..5f15bbc178a 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs +++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs @@ -29,7 +29,7 @@ QtcLibrary { "gradientline.cpp", "gradientline.h", "huecontrol.cpp", "huecontrol.h", "qmleditorwidgets_global.h", - "resources.qrc" + "resources_qmleditorwidgets.qrc" ] } diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources_qmleditorwidgets.qrc similarity index 100% rename from src/libs/qmleditorwidgets/resources.qrc rename to src/libs/qmleditorwidgets/resources_qmleditorwidgets.qrc diff --git a/src/plugins/mesonprojectmanager/CMakeLists.txt b/src/plugins/mesonprojectmanager/CMakeLists.txt index 4fd43d672af..ea66df93f88 100644 --- a/src/plugins/mesonprojectmanager/CMakeLists.txt +++ b/src/plugins/mesonprojectmanager/CMakeLists.txt @@ -83,7 +83,7 @@ add_qtc_plugin(MesonProjectManager machinefiles/machinefilemanager.cpp machinefiles/nativefilegenerator.h machinefiles/nativefilegenerator.cpp - resources.qrc + resources_meson.qrc ) file(RELATIVE_PATH RELATIVE_TEST_PATH "${PROJECT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}") diff --git a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs index 3a9ce46d718..2499ac3f9c0 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs +++ b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs @@ -78,7 +78,7 @@ Project { "project/projecttree/mesonprojectnodes.h", "project/projecttree/projecttree.cpp", "project/projecttree/projecttree.h", - "resources.qrc", + "resources_meson.qrc", "settings/general/settings.cpp", "settings/general/settings.h", "settings/tools/kitaspect/mesontoolkitaspect.cpp", diff --git a/src/plugins/mesonprojectmanager/resources.qrc b/src/plugins/mesonprojectmanager/resources_meson.qrc similarity index 100% rename from src/plugins/mesonprojectmanager/resources.qrc rename to src/plugins/mesonprojectmanager/resources_meson.qrc diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 786cb7aa861..c5e5a0d9d22 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -325,7 +325,7 @@ extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner SOURCES_PREFIX components - SOURCES resources/resources.qrc + SOURCES resources/resources_qmldesigner_components.qrc ) extend_qtc_plugin(QmlDesigner diff --git a/src/plugins/qmldesigner/components/resources/resources.qrc b/src/plugins/qmldesigner/components/resources/resources_qmldesigner_components.qrc similarity index 100% rename from src/plugins/qmldesigner/components/resources/resources.qrc rename to src/plugins/qmldesigner/components/resources/resources_qmldesigner_components.qrc diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 6d556ea0d4b..ce8dfe20804 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -736,7 +736,7 @@ Project { "propertyeditor/qmlmodelnodeproxy.h", "propertyeditor/tooltip.cpp", "propertyeditor/tooltip.h", - "resources/resources.qrc", + "resources/resources_qmldesigner_components.qrc", "stateseditor/stateseditorimageprovider.cpp", "stateseditor/stateseditorimageprovider.h", "stateseditor/stateseditormodel.cpp",