diff options
author | Kai Köhne <kai.koehne@qt.io> | 2023-05-02 12:25:58 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2023-05-03 12:14:23 +0200 |
commit | 9c75880e59aac0dbe81fd539f2170d999c959183 (patch) | |
tree | 26ed3bb59cc732267ed7d9f4afdb82c89ad0b4c3 | |
parent | f2bab1d2e88821152d756c0ca77a52def0f80c62 (diff) |
Use versioned CMake targets for Qt modules
Use e.g. Qt6::Core instead of Qt::Core. This is better matching the
find_package(Qt6 ...) call, and also avoids issues that the versionless
targets have.
Task-number: QTBUG-113277
Change-Id: I9bc7963d8524ef2ab061e32aef428711646247a7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 835f15cfbb628938fcd7bfa4e334dec6199e54c6)
-rw-r--r-- | examples/demos/CMakeLists.txt | 10 | ||||
-rw-r--r-- | examples/demos/calqlatr/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/demos/clocks/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/demos/coffee/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/demos/colorpaletteclient/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/demos/documentviewer/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/demos/hangman/CMakeLists.txt | 10 | ||||
-rw-r--r-- | examples/demos/maroon/CMakeLists.txt | 12 | ||||
-rw-r--r-- | examples/demos/photosurface/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/demos/photoviewer/CMakeLists.txt | 10 | ||||
-rw-r--r-- | examples/demos/rssnews/CMakeLists.txt | 10 | ||||
-rw-r--r-- | examples/demos/samegame/CMakeLists.txt | 10 | ||||
-rw-r--r-- | examples/demos/stocqt/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/demos/tweetsearch/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/tutorials/alarms/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/qml/qqmlparser/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/quick/examples/CMakeLists.txt | 12 |
18 files changed, 76 insertions, 76 deletions
diff --git a/examples/demos/CMakeLists.txt b/examples/demos/CMakeLists.txt index d49015fc3..895e70f26 100644 --- a/examples/demos/CMakeLists.txt +++ b/examples/demos/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(TARGET Qt::Quick) +if(TARGET Qt6::Quick) qt_internal_add_example(samegame) qt_internal_add_example(calqlatr) qt_internal_add_example(clocks) @@ -9,20 +9,20 @@ if(TARGET Qt::Quick) qt_internal_add_example(maroon) qt_internal_add_example(stocqt) endif() -if(TARGET Qt::Quick AND TARGET Qt::QuickControls2) +if(TARGET Qt6::Quick AND TARGET Qt6::QuickControls2) qt_internal_add_example(colorpaletteclient) qt_internal_add_example(coffee) if(ANDROID OR IOS) qt_internal_add_example(hangman) endif() endif() -if(TARGET Qt::Quick AND TARGET Qt::Network AND TARGET Qt::QmlXmlListModel) +if(TARGET Qt6::Quick AND TARGET Qt6::Network AND TARGET Qt6::QmlXmlListModel) qt_internal_add_example(rssnews) qt_internal_add_example(photoviewer) endif() -if(TARGET Qt::Quick AND TARGET Qt::qsb AND TARGET Qt::Pdf) +if(TARGET Qt6::Quick AND TARGET Qt6::qsb AND TARGET Qt6::Pdf) qt_internal_add_example(photosurface) endif() -if(TARGET Qt::Widgets AND TARGET Qt::PdfWidgets) +if(TARGET Qt6::Widgets AND TARGET Qt6::PdfWidgets) qt_internal_add_example(documentviewer) endif() diff --git a/examples/demos/calqlatr/CMakeLists.txt b/examples/demos/calqlatr/CMakeLists.txt index 78126cb2a..13102f960 100644 --- a/examples/demos/calqlatr/CMakeLists.txt +++ b/examples/demos/calqlatr/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(calqlatrexample WIN32 MACOSX_BUNDLE ) target_link_libraries(calqlatrexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt6_add_qml_module(calqlatrexample diff --git a/examples/demos/clocks/CMakeLists.txt b/examples/demos/clocks/CMakeLists.txt index 55b6034f4..9fc27be72 100644 --- a/examples/demos/clocks/CMakeLists.txt +++ b/examples/demos/clocks/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(clocks PROPERTIES ) target_link_libraries(clocks PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/demos/coffee/CMakeLists.txt b/examples/demos/coffee/CMakeLists.txt index ffb1ff771..ec5415b8f 100644 --- a/examples/demos/coffee/CMakeLists.txt +++ b/examples/demos/coffee/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(coffee PROPERTIES ) target_link_libraries(coffee PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/demos/colorpaletteclient/CMakeLists.txt b/examples/demos/colorpaletteclient/CMakeLists.txt index 5b8f1a145..83cc603fa 100644 --- a/examples/demos/colorpaletteclient/CMakeLists.txt +++ b/examples/demos/colorpaletteclient/CMakeLists.txt @@ -50,10 +50,10 @@ qt_add_qml_module(colorpaletteclient ) target_link_libraries(colorpaletteclient PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS colorpaletteclient diff --git a/examples/demos/documentviewer/CMakeLists.txt b/examples/demos/documentviewer/CMakeLists.txt index 338f65cda..a637c5d37 100644 --- a/examples/demos/documentviewer/CMakeLists.txt +++ b/examples/demos/documentviewer/CMakeLists.txt @@ -76,10 +76,10 @@ qt6_add_resources(documentviewer "documentviewer" ) target_link_libraries(documentviewer PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets - Qt::PdfWidgets + Qt6::Core + Qt6::Gui + Qt6::Widgets + Qt6::PdfWidgets ) if(TARGET Qt6::PrintSupport) diff --git a/examples/demos/hangman/CMakeLists.txt b/examples/demos/hangman/CMakeLists.txt index 1f6d36b12..414615ceb 100644 --- a/examples/demos/hangman/CMakeLists.txt +++ b/examples/demos/hangman/CMakeLists.txt @@ -93,11 +93,11 @@ if(IOS) endif() target_link_libraries(hangman PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick + Qt6::QuickControls2 ) qt_finalize_executable(hangman) diff --git a/examples/demos/maroon/CMakeLists.txt b/examples/demos/maroon/CMakeLists.txt index 0b05d8802..2655517d5 100644 --- a/examples/demos/maroon/CMakeLists.txt +++ b/examples/demos/maroon/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(maroon PROPERTIES ) target_link_libraries(maroon PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: @@ -108,9 +108,9 @@ qt6_add_resources(maroon "maroon" ${maroon_resource_files} ) -if(TARGET Qt::Multimedia) +if(TARGET Qt6::Multimedia) target_link_libraries(maroon PUBLIC - Qt::Multimedia + Qt6::Multimedia ) endif() diff --git a/examples/demos/photosurface/CMakeLists.txt b/examples/demos/photosurface/CMakeLists.txt index d52491098..9cea19fb5 100644 --- a/examples/demos/photosurface/CMakeLists.txt +++ b/examples/demos/photosurface/CMakeLists.txt @@ -40,10 +40,10 @@ else() endif() target_link_libraries(photosurfaceexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(photosurfaceexample diff --git a/examples/demos/photoviewer/CMakeLists.txt b/examples/demos/photoviewer/CMakeLists.txt index 0482b8b14..1f67ad16a 100644 --- a/examples/demos/photoviewer/CMakeLists.txt +++ b/examples/demos/photoviewer/CMakeLists.txt @@ -24,11 +24,11 @@ set_target_properties(photoviewer PROPERTIES ) target_link_libraries(photoviewer PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QmlXmlListModel + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick + Qt6::QmlXmlListModel ) # Resources: diff --git a/examples/demos/rssnews/CMakeLists.txt b/examples/demos/rssnews/CMakeLists.txt index 9ad3022b2..000e6ddf7 100644 --- a/examples/demos/rssnews/CMakeLists.txt +++ b/examples/demos/rssnews/CMakeLists.txt @@ -24,11 +24,11 @@ set_target_properties(rssnews PROPERTIES ) target_link_libraries(rssnews PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QmlXmlListModel + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick + Qt6::QmlXmlListModel ) # Resources: diff --git a/examples/demos/samegame/CMakeLists.txt b/examples/demos/samegame/CMakeLists.txt index dd01a09e2..79dd0684c 100644 --- a/examples/demos/samegame/CMakeLists.txt +++ b/examples/demos/samegame/CMakeLists.txt @@ -24,11 +24,11 @@ set_target_properties(samegame PROPERTIES ) target_link_libraries(samegame PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::Sql + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick + Qt6::Sql ) # Resources: diff --git a/examples/demos/stocqt/CMakeLists.txt b/examples/demos/stocqt/CMakeLists.txt index 9af119042..022110332 100644 --- a/examples/demos/stocqt/CMakeLists.txt +++ b/examples/demos/stocqt/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(stocqt PROPERTIES ) target_link_libraries(stocqt PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/demos/tweetsearch/CMakeLists.txt b/examples/demos/tweetsearch/CMakeLists.txt index 5f3cf62d7..7acc3030f 100644 --- a/examples/demos/tweetsearch/CMakeLists.txt +++ b/examples/demos/tweetsearch/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(tweetsearch PROPERTIES ) target_link_libraries(tweetsearch PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/tutorials/alarms/CMakeLists.txt b/examples/tutorials/alarms/CMakeLists.txt index 246b82399..12be92e8e 100644 --- a/examples/tutorials/alarms/CMakeLists.txt +++ b/examples/tutorials/alarms/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(alarms PROPERTIES ) target_link_libraries(alarms PUBLIC - Qt::Core - Qt::Gui - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Quick ) # Resources: diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index f7bf2206e..a39a62042 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -3,9 +3,9 @@ # Generated from auto.pro. -if(TARGET Qt::Quick) +if(TARGET Qt6::Quick) add_subdirectory(quick) endif() -if(TARGET Qt::Qml) +if(TARGET Qt6::Qml) add_subdirectory(qml) endif() diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt index 7af990e96..e6f8bca03 100644 --- a/tests/auto/qml/qqmlparser/CMakeLists.txt +++ b/tests/auto/qml/qqmlparser/CMakeLists.txt @@ -13,8 +13,8 @@ qt_internal_add_test(tst_qqmlparser_doc # special case DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" LIBRARIES - Qt::Gui - Qt::QmlPrivate + Qt6::Gui + Qt6::QmlPrivate ) ## Scopes: diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt index ae8c4a62c..0e65c930e 100644 --- a/tests/auto/quick/examples/CMakeLists.txt +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -13,11 +13,11 @@ qt_internal_add_test(tst_examples DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickPrivate + Qt6::CorePrivate + Qt6::Gui + Qt6::GuiPrivate + Qt6::QmlPrivate + Qt6::QuickPrivate ) #### Keys ignored in scope 1:.:.:examples.pro:<TRUE>: @@ -26,7 +26,7 @@ qt_internal_add_test(tst_examples ## Scopes: ##################################################################### -qt_internal_extend_target(tst_examples CONDITION NOT TARGET Qt::XmlPatterns +qt_internal_extend_target(tst_examples CONDITION NOT TARGET Qt6::XmlPatterns DEFINES QT_NO_XMLPATTERNS ) |