diff options
author | Kai Köhne <kai.koehne@qt.io> | 2024-01-04 14:58:20 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-17 22:32:37 +0000 |
commit | bc4bccb87eacac2e44c4c9ed268791d4c13606ea (patch) | |
tree | e56b7d4f77a34b9fac08643165934853f18a2a7e | |
parent | 560dd7caa1a26b4727616e35db07ee74f10824ac (diff) |
Examples: Use versioned CMake targets for Qt modules
Task-number: QTBUG-113277
Change-Id: I4885e6df894e24c2fdacccc4e58530ee9b190968
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 91c3e3dceaaaf27e7e92425e99f42898871fb6c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f87eb7401c50cf8fca61e49f06e1bfbb52964639)
-rw-r--r-- | examples/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/bluetooth/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/bluetooth/btchat/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/bluetooth/heartrate-game/CMakeLists.txt | 10 | ||||
-rw-r--r-- | examples/bluetooth/heartrate-server/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/bluetooth/lowenergyscanner/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/nfc/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/CMakeLists.txt | 8 |
8 files changed, 25 insertions, 25 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 2f688d08..edf465a1 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -3,10 +3,10 @@ qt_examples_build_begin(EXTERNAL_BUILD) -if(TARGET Qt::Bluetooth) +if(TARGET Qt6::Bluetooth) add_subdirectory(bluetooth) endif() -if(TARGET Qt::Nfc) +if(TARGET Qt6::Nfc) add_subdirectory(nfc) endif() diff --git a/examples/bluetooth/CMakeLists.txt b/examples/bluetooth/CMakeLists.txt index 6582092b..0a33879e 100644 --- a/examples/bluetooth/CMakeLists.txt +++ b/examples/bluetooth/CMakeLists.txt @@ -2,10 +2,10 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_example(heartrate-server) -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(btchat) endif() -if(TARGET Qt::Quick) +if(TARGET Qt6::Quick) qt_internal_add_example(lowenergyscanner) qt_internal_add_example(heartrate-game) endif() diff --git a/examples/bluetooth/btchat/CMakeLists.txt b/examples/bluetooth/btchat/CMakeLists.txt index 0e4e217c..aaba1b14 100644 --- a/examples/bluetooth/btchat/CMakeLists.txt +++ b/examples/bluetooth/btchat/CMakeLists.txt @@ -40,9 +40,9 @@ set_target_properties(btchat PROPERTIES ) target_link_libraries(btchat PRIVATE - Qt::Bluetooth - Qt::Core - Qt::Widgets + Qt6::Bluetooth + Qt6::Core + Qt6::Widgets ) if (APPLE) diff --git a/examples/bluetooth/heartrate-game/CMakeLists.txt b/examples/bluetooth/heartrate-game/CMakeLists.txt index 36a5a582..5e3137df 100644 --- a/examples/bluetooth/heartrate-game/CMakeLists.txt +++ b/examples/bluetooth/heartrate-game/CMakeLists.txt @@ -25,11 +25,11 @@ set_target_properties(heartrate-game PROPERTIES ) target_link_libraries(heartrate-game PRIVATE - Qt::Bluetooth - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Bluetooth + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) set_source_files_properties(GameSettings.qml PROPERTIES diff --git a/examples/bluetooth/heartrate-server/CMakeLists.txt b/examples/bluetooth/heartrate-server/CMakeLists.txt index 0faca6d8..b4c192b7 100644 --- a/examples/bluetooth/heartrate-server/CMakeLists.txt +++ b/examples/bluetooth/heartrate-server/CMakeLists.txt @@ -27,13 +27,13 @@ set_target_properties(heartrate-server PROPERTIES ) target_link_libraries(heartrate-server PRIVATE - Qt::Bluetooth - Qt::Core + Qt6::Bluetooth + Qt6::Core ) if(ANDROID OR APPLE) target_link_libraries(heartrate-server PRIVATE - Qt::Gui + Qt6::Gui ) endif() diff --git a/examples/bluetooth/lowenergyscanner/CMakeLists.txt b/examples/bluetooth/lowenergyscanner/CMakeLists.txt index 252a6818..951eaef5 100644 --- a/examples/bluetooth/lowenergyscanner/CMakeLists.txt +++ b/examples/bluetooth/lowenergyscanner/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(lowenergyscanner PROPERTIES ) target_link_libraries(lowenergyscanner PUBLIC - Qt::Bluetooth - Qt::Core - Qt::Gui - Qt::Quick + Qt6::Bluetooth + Qt6::Core + Qt6::Gui + Qt6::Quick ) if (APPLE) diff --git a/examples/nfc/CMakeLists.txt b/examples/nfc/CMakeLists.txt index 47bc9416..0dd7eb29 100644 --- a/examples/nfc/CMakeLists.txt +++ b/examples/nfc/CMakeLists.txt @@ -1,9 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(annotatedurl) endif() -if(TARGET Qt::QuickControls2) +if(TARGET Qt6::QuickControls2) qt_internal_add_example(ndefeditor) endif() diff --git a/examples/nfc/annotatedurl/CMakeLists.txt b/examples/nfc/annotatedurl/CMakeLists.txt index 6378dde4..39894448 100644 --- a/examples/nfc/annotatedurl/CMakeLists.txt +++ b/examples/nfc/annotatedurl/CMakeLists.txt @@ -33,10 +33,10 @@ if(IOS) endif() target_link_libraries(annotatedurl PRIVATE - Qt::Core - Qt::Gui - Qt::Nfc - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Nfc + Qt6::Widgets ) if(ANDROID) |