diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2022-05-05 16:56:10 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2022-05-06 09:52:50 +0000 |
| commit | 09c64e640da9608df73e87791b615d66e8178ddd (patch) | |
| tree | e87a2f2f1fa7af2be0d4c52b853388e834903f21 /src/libs/modelinglib | |
| parent | ef346779eb500c3661fb46fa0722e9270d6adecf (diff) | |
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>
Diffstat (limited to 'src/libs/modelinglib')
| -rw-r--r-- | src/libs/modelinglib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/libs/modelinglib/modelinglib.qbs | 2 | ||||
| -rw-r--r-- | src/libs/modelinglib/qmt/resources/resources_modelinglib.qrc (renamed from src/libs/modelinglib/qmt/resources/resources.qrc) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/modelinglib/CMakeLists.txt b/src/libs/modelinglib/CMakeLists.txt index fcead64fd0..64992d8fb4 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 b9ee382bbd..f6ccb20097 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 index f6ff6af119..f6ff6af119 100644 --- a/src/libs/modelinglib/qmt/resources/resources.qrc +++ b/src/libs/modelinglib/qmt/resources/resources_modelinglib.qrc |