diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-13 10:16:21 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-06-19 10:29:30 +0200 |
| commit | 8a03de58a46b8d675eef1ae73350b60cf3d331d5 (patch) | |
| tree | ace56a3141f76b9207af8fd0da9fd5b1581573e6 | |
| parent | 50ac27600a6b7fc71470b8638d9a81945d19dda0 (diff) | |
Resolve a duplicate target name issue
Both robotarm, and todolist examples were creating `content` target
which was breaking the build if both examples were activated.
Fixes: QTBUG-114670
Change-Id: I0922765526f2fca861c16b1ced4f1c040c104adc
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
(cherry picked from commit 8b6976b931e81f9d2aa9f31fb09bcb20a5a29cc2)
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
| -rw-r--r-- | examples/demos/robotarm/content/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/demos/robotarm/qmlmodules | 2 | ||||
| -rw-r--r-- | examples/demos/todolist/content/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/demos/todolist/qmlmodules.cmake | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/demos/robotarm/content/CMakeLists.txt b/examples/demos/robotarm/content/CMakeLists.txt index 5a6d289f8..dff4a9cf7 100644 --- a/examples/demos/robotarm/content/CMakeLists.txt +++ b/examples/demos/robotarm/content/CMakeLists.txt @@ -1,8 +1,8 @@ ### This file is automatically generated by Qt Design Studio. ### Do not change -qt_add_library(content STATIC) -qt6_add_qml_module(content +qt_add_library(robotarm_content STATIC) +qt6_add_qml_module(robotarm_content URI "content" VERSION 1.0 QML_FILES diff --git a/examples/demos/robotarm/qmlmodules b/examples/demos/robotarm/qmlmodules index 0b3c1fcc0..e54e1ee61 100644 --- a/examples/demos/robotarm/qmlmodules +++ b/examples/demos/robotarm/qmlmodules @@ -17,7 +17,7 @@ set(QML_IMPORT_PATH CACHE STRING "") target_link_libraries(RobotArmApp PRIVATE - contentplugin + robotarm_contentplugin RobotArmplugin backendmodule ) diff --git a/examples/demos/todolist/content/CMakeLists.txt b/examples/demos/todolist/content/CMakeLists.txt index 6eaadfd8f..c30d0ed97 100644 --- a/examples/demos/todolist/content/CMakeLists.txt +++ b/examples/demos/todolist/content/CMakeLists.txt @@ -1,8 +1,8 @@ #Copyright (C) 2023 The Qt Company Ltd. #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -qt_add_library(content STATIC) -qt6_add_qml_module(content +qt_add_library(todolist_content STATIC) +qt6_add_qml_module(todolist_content URI "content" VERSION 1.0 QML_FILES diff --git a/examples/demos/todolist/qmlmodules.cmake b/examples/demos/todolist/qmlmodules.cmake index 973b84195..48e9e6bd7 100644 --- a/examples/demos/todolist/qmlmodules.cmake +++ b/examples/demos/todolist/qmlmodules.cmake @@ -12,7 +12,7 @@ add_subdirectory(content) add_subdirectory(imports) target_link_libraries(ToDoListApp PRIVATE - contentplugin + todolist_contentplugin CustomControlsplugin CustomStyleplugin ToDoListplugin |