diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-08-30 17:37:58 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-01 10:00:51 +0000 |
commit | 81d3c7acc6e63eec19eddcb23daa40ebc5b1d323 (patch) | |
tree | 6faebecb4d684f198626c736ce32541c2edcb0b9 | |
parent | 3fc526499f8279c3507c4e534fb8dd3a7e968482 (diff) |
Fix target name collision for top level build
When doing top level build we have tests and examples which
have same target name as in other modules.
Task-number: QTBUG-95590
Change-Id: I94662b3b8f71583213dea664df35b86e24dc7579
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit eb06977c7a8d4afb4b15e02f818dd658c04d1cc8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | examples/webengine/minimal/CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/auto/widgets/accessibility/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/widgets/proxy/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/webengine/minimal/CMakeLists.txt b/examples/webengine/minimal/CMakeLists.txt index 2972fc63b..ecfc05879 100644 --- a/examples/webengine/minimal/CMakeLists.txt +++ b/examples/webengine/minimal/CMakeLists.txt @@ -17,14 +17,14 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS WebEngineQuick) -qt_add_executable(minimal-qml +qt_add_executable(webengine-minimal-qml main.cpp ) -set_target_properties(minimal-qml PROPERTIES +set_target_properties(webengine-minimal-qml PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(minimal-qml PUBLIC +target_link_libraries(webengine-minimal-qml PUBLIC Qt::Core Qt::Gui Qt::WebEngineQuick @@ -36,14 +36,14 @@ set(qml_resource_files "main.qml" ) -qt6_add_resources(minimal-qml "qml" +qt6_add_resources(webengine-minimal-qml "qml" PREFIX "/" FILES ${qml_resource_files} ) -install(TARGETS minimal-qml +install(TARGETS webengine-minimal-qml RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/tests/auto/widgets/accessibility/CMakeLists.txt b/tests/auto/widgets/accessibility/CMakeLists.txt index 9653ef1c0..bd04bddd0 100644 --- a/tests/auto/widgets/accessibility/CMakeLists.txt +++ b/tests/auto/widgets/accessibility/CMakeLists.txt @@ -1,6 +1,6 @@ include(../../util/util.cmake) -qt_internal_add_test(tst_accessibility +qt_internal_add_test(tst_webengine_accessibility SOURCES tst_accessibility.cpp LIBRARIES diff --git a/tests/auto/widgets/proxy/CMakeLists.txt b/tests/auto/widgets/proxy/CMakeLists.txt index 0929c050c..03af3c35f 100644 --- a/tests/auto/widgets/proxy/CMakeLists.txt +++ b/tests/auto/widgets/proxy/CMakeLists.txt @@ -1,6 +1,6 @@ include(../../httpserver/httpserver.cmake) -qt_internal_add_test(tst_proxy +qt_internal_add_test(tst_webengine_proxy SOURCES tst_proxy.cpp LIBRARIES |