Static Build: make sure the .qrc files have unique names

resources.qrc was present in multiple plugins and Q_INIT_RESOURCE
requires an unique name to proper initialize the resource.

Change-Id: I2d514ab4b8cc41655009996f28aadca9c454d818
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Cristian Adam
2022-05-05 16:56:10 +02:00
parent ef346779eb
commit 09c64e640d
12 changed files with 8 additions and 8 deletions

View File

@@ -137,7 +137,7 @@ add_qtc_library(Modeling
qmt/model_widgets_ui/propertiesviewmview.cpp qmt/model_widgets_ui/propertiesviewmview.h qmt/model_widgets_ui/propertiesviewmview.cpp qmt/model_widgets_ui/propertiesviewmview.h
qmt/project_controller/projectcontroller.cpp qmt/project_controller/projectcontroller.h qmt/project_controller/projectcontroller.cpp qmt/project_controller/projectcontroller.h
qmt/project/project.cpp qmt/project/project.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/diagramserializer.cpp qmt/serializer/diagramserializer.h
qmt/serializer/infrastructureserializer.cpp qmt/serializer/infrastructureserializer.h qmt/serializer/infrastructureserializer.cpp qmt/serializer/infrastructureserializer.h
qmt/serializer/modelserializer.cpp qmt/serializer/modelserializer.h qmt/serializer/modelserializer.cpp qmt/serializer/modelserializer.h

View File

@@ -354,7 +354,7 @@ QtcLibrary {
name: "Images" name: "Images"
prefix: "./qmt/resources/" prefix: "./qmt/resources/"
files: [ files: [
"resources.qrc", "resources_modelinglib.qrc",
"25x25/align-bottom.png", "25x25/align-bottom.png",
"25x25/align-horizontal.png", "25x25/align-horizontal.png",
"25x25/align-left.png", "25x25/align-left.png",

View File

@@ -18,5 +18,5 @@ add_qtc_library(QmlEditorWidgets
gradientline.cpp gradientline.h gradientline.cpp gradientline.h
huecontrol.cpp huecontrol.h huecontrol.cpp huecontrol.h
qmleditorwidgets_global.h qmleditorwidgets_global.h
resources.qrc resources_qmleditorwidgets.qrc
) )

View File

@@ -29,7 +29,7 @@ QtcLibrary {
"gradientline.cpp", "gradientline.h", "gradientline.cpp", "gradientline.h",
"huecontrol.cpp", "huecontrol.h", "huecontrol.cpp", "huecontrol.h",
"qmleditorwidgets_global.h", "qmleditorwidgets_global.h",
"resources.qrc" "resources_qmleditorwidgets.qrc"
] ]
} }

View File

@@ -83,7 +83,7 @@ add_qtc_plugin(MesonProjectManager
machinefiles/machinefilemanager.cpp machinefiles/machinefilemanager.cpp
machinefiles/nativefilegenerator.h machinefiles/nativefilegenerator.h
machinefiles/nativefilegenerator.cpp machinefiles/nativefilegenerator.cpp
resources.qrc resources_meson.qrc
) )
file(RELATIVE_PATH RELATIVE_TEST_PATH "${PROJECT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}") file(RELATIVE_PATH RELATIVE_TEST_PATH "${PROJECT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")

View File

@@ -78,7 +78,7 @@ Project {
"project/projecttree/mesonprojectnodes.h", "project/projecttree/mesonprojectnodes.h",
"project/projecttree/projecttree.cpp", "project/projecttree/projecttree.cpp",
"project/projecttree/projecttree.h", "project/projecttree/projecttree.h",
"resources.qrc", "resources_meson.qrc",
"settings/general/settings.cpp", "settings/general/settings.cpp",
"settings/general/settings.h", "settings/general/settings.h",
"settings/tools/kitaspect/mesontoolkitaspect.cpp", "settings/tools/kitaspect/mesontoolkitaspect.cpp",

View File

@@ -325,7 +325,7 @@ extend_qtc_plugin(QmlDesigner
extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner
SOURCES_PREFIX components SOURCES_PREFIX components
SOURCES resources/resources.qrc SOURCES resources/resources_qmldesigner_components.qrc
) )
extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner

View File

@@ -736,7 +736,7 @@ Project {
"propertyeditor/qmlmodelnodeproxy.h", "propertyeditor/qmlmodelnodeproxy.h",
"propertyeditor/tooltip.cpp", "propertyeditor/tooltip.cpp",
"propertyeditor/tooltip.h", "propertyeditor/tooltip.h",
"resources/resources.qrc", "resources/resources_qmldesigner_components.qrc",
"stateseditor/stateseditorimageprovider.cpp", "stateseditor/stateseditorimageprovider.cpp",
"stateseditor/stateseditorimageprovider.h", "stateseditor/stateseditorimageprovider.h",
"stateseditor/stateseditormodel.cpp", "stateseditor/stateseditormodel.cpp",