Examples: 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.

Pick-to: 6.5
Task-number: QTBUG-113277
Change-Id: Ib80f885e9f73fb9ad54b9e9b22cae2318877dc07
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

21 files changed, 65 insertions, 65 deletions

diff --git a/examples/qml/CMakeLists.txt b/examples/qml/CMakeLists.txt
index 3d2cbc4503..331a4dcda4 100644
--- a/examples/qml/CMakeLists.txt
+++ b/examples/qml/CMakeLists.txt
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 add_subdirectory(tutorials)
-if(TARGET Qt::Quick)
+if(TARGET Qt6::Quick)
     qt_internal_add_example(qmlextensionplugins)
-    if (TARGET Qt::lupdate)
+    if (TARGET Qt6::lupdate)
         qt_internal_add_example(qml-i18n)
     endif()
     qt_internal_add_example(dynamicscene)
diff --git a/examples/qml/dynamicscene/CMakeLists.txt b/examples/qml/dynamicscene/CMakeLists.txt
index 2999324307..7d4f538194 100644
--- a/examples/qml/dynamicscene/CMakeLists.txt
+++ b/examples/qml/dynamicscene/CMakeLists.txt
@@ -20,10 +20,10 @@ qt_standard_project_setup(REQUIRES 6.5)
 qt_add_executable(dynamicsceneexample WIN32 MACOSX_BUNDLE main.cpp)
 
 target_link_libraries(dynamicsceneexample PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
+    Qt6::Quick
 )
 
 qt_add_qml_module(dynamicsceneexample
diff --git a/examples/qml/qml-i18n/CMakeLists.txt b/examples/qml/qml-i18n/CMakeLists.txt
index 83bec4d11b..6ee8dafc03 100644
--- a/examples/qml/qml-i18n/CMakeLists.txt
+++ b/examples/qml/qml-i18n/CMakeLists.txt
@@ -18,10 +18,10 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Qml LinguistTools)
 qt_add_executable(qmli18n WIN32 MACOSX_BUNDLE main.cpp)
 
 target_link_libraries(qmli18n PRIVATE
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
+    Qt6::Quick
 )
 
 qt_add_qml_module(qmli18n
diff --git a/examples/qml/qmldom/CMakeLists.txt b/examples/qml/qmldom/CMakeLists.txt
index daaee2f5b5..a0bdd5b81a 100644
--- a/examples/qml/qmldom/CMakeLists.txt
+++ b/examples/qml/qmldom/CMakeLists.txt
@@ -23,9 +23,9 @@ qt_add_executable(qmldomloadeditwrite
 )
 
 target_link_libraries(qmldomloadeditwrite PUBLIC
-    Qt::Core
-    Qt::Qml
-    Qt::QmlDomPrivate
+    Qt6::Core
+    Qt6::Qml
+    Qt6::QmlDomPrivate
 )
 
 install(TARGETS qmldomloadeditwrite
diff --git a/examples/qml/qmlextensionplugins/CMakeLists.txt b/examples/qml/qmlextensionplugins/CMakeLists.txt
index 0a16d6c843..26e454b0b4 100644
--- a/examples/qml/qmlextensionplugins/CMakeLists.txt
+++ b/examples/qml/qmlextensionplugins/CMakeLists.txt
@@ -50,9 +50,9 @@ set_target_properties(qmlqtimeexample PROPERTIES
 )
 
 target_link_libraries(qmlqtimeexample PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
 )
 
 install(TARGETS qmlqtimeexample
diff --git a/examples/qml/tutorials/CMakeLists.txt b/examples/qml/tutorials/CMakeLists.txt
index 1a82ed75af..48b4bc77c4 100644
--- a/examples/qml/tutorials/CMakeLists.txt
+++ b/examples/qml/tutorials/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(TARGET Qt::Quick)
+if(TARGET Qt6::Quick)
     add_subdirectory(extending-qml)
 endif()
diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced1-Base-project/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced1-Base-project/CMakeLists.txt
index a8064b77ef..d1710e2d49 100644
--- a/examples/qml/tutorials/extending-qml-advanced/advanced1-Base-project/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml-advanced/advanced1-Base-project/CMakeLists.txt
@@ -27,8 +27,8 @@ set_target_properties(baseproject PROPERTIES
 )
 
 target_link_libraries(baseproject PUBLIC
-    Qt::Core
-    Qt::Qml
+    Qt6::Core
+    Qt6::Qml
 )
 
 qt_add_qml_module(baseproject
diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced2-Inheritance-and-coercion/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced2-Inheritance-and-coercion/CMakeLists.txt
index 0267cf09b2..0d15362a24 100644
--- a/examples/qml/tutorials/extending-qml-advanced/advanced2-Inheritance-and-coercion/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml-advanced/advanced2-Inheritance-and-coercion/CMakeLists.txt
@@ -27,8 +27,8 @@ set_target_properties(coercion PROPERTIES
 )
 
 target_link_libraries(coercion PUBLIC
-    Qt::Core
-    Qt::Qml
+    Qt6::Core
+    Qt6::Qml
 )
 
 qt_add_qml_module(coercion
diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced3-Default-properties/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced3-Default-properties/CMakeLists.txt
index 079d965280..1dbacfc62e 100644
--- a/examples/qml/tutorials/extending-qml-advanced/advanced3-Default-properties/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml-advanced/advanced3-Default-properties/CMakeLists.txt
@@ -27,8 +27,8 @@ set_target_properties(default PROPERTIES
 )
 
 target_link_libraries(default PUBLIC
-    Qt::Core
-    Qt::Qml
+    Qt6::Core
+    Qt6::Qml
 )
 
 qt_add_qml_module(default
diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced4-Grouped-properties/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced4-Grouped-properties/CMakeLists.txt
index 89aff6402f..a84f594330 100644
--- a/examples/qml/tutorials/extending-qml-advanced/advanced4-Grouped-properties/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml-advanced/advanced4-Grouped-properties/CMakeLists.txt
@@ -27,9 +27,9 @@ set_target_properties(grouped PROPERTIES
 )
 
 target_link_libraries(grouped PUBLIC
-    Qt::Core
-    Qt::Qml
-    Qt::Gui
+    Qt6::Core
+    Qt6::Qml
+    Qt6::Gui
 )
 
 qt_add_qml_module(grouped
diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced5-Attached-properties/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced5-Attached-properties/CMakeLists.txt
index ca062f4675..f219132a96 100644
--- a/examples/qml/tutorials/extending-qml-advanced/advanced5-Attached-properties/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml-advanced/advanced5-Attached-properties/CMakeLists.txt
@@ -27,9 +27,9 @@ set_target_properties(attached PROPERTIES
 )
 
 target_link_libraries(attached PUBLIC
-    Qt::Core
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Qml
+    Qt6::Quick
 )
 
 qt_add_qml_module(attached
diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced6-Property-value-source/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced6-Property-value-source/CMakeLists.txt
index 67ca56153c..9a30aa30f3 100644
--- a/examples/qml/tutorials/extending-qml-advanced/advanced6-Property-value-source/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml-advanced/advanced6-Property-value-source/CMakeLists.txt
@@ -28,9 +28,9 @@ set_target_properties(valuesource PROPERTIES
 )
 
 target_link_libraries(valuesource PUBLIC
-    Qt::Core
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Qml
+    Qt6::Quick
 )
 
 qt_add_qml_module(valuesource
diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/CMakeLists.txt
index 3769b887c0..f26e546297 100644
--- a/examples/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/CMakeLists.txt
@@ -29,9 +29,9 @@ qt_add_executable(foreign
 )
 
 target_link_libraries(foreign PUBLIC
-    Qt::Core
-    Qt::Qml
-    Qt::Gui
+    Qt6::Core
+    Qt6::Qml
+    Qt6::Gui
     library
 )
 
diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/library/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/library/CMakeLists.txt
index 5b4528a340..5fbdfb70fd 100644
--- a/examples/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/library/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/library/CMakeLists.txt
@@ -10,8 +10,8 @@ add_library(library ThirdPartyDisplay.cpp ThirdPartyDisplay.h)
 qt_extract_metatypes(library)
 
 target_link_libraries(library PUBLIC
-    Qt::Core
-    Qt::Qml
-    Qt::Quick
-    Qt::Gui
+    Qt6::Core
+    Qt6::Qml
+    Qt6::Quick
+    Qt6::Gui
 )
diff --git a/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt
index 02ed972ef5..287aab3000 100644
--- a/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt
@@ -25,10 +25,10 @@ set_target_properties(chapter1-basics PROPERTIES
 )
 
 target_link_libraries(chapter1-basics PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
+    Qt6::Quick
 )
 #![0]
 qt_add_qml_module(chapter1-basics
diff --git a/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt
index f0906cf380..738fae8b59 100644
--- a/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt
@@ -25,10 +25,10 @@ set_target_properties(chapter2-methods PROPERTIES
 )
 
 target_link_libraries(chapter2-methods PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
+    Qt6::Quick
 )
 
 qt_add_qml_module(chapter2-methods
diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt
index 05c567fd30..8107636876 100644
--- a/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt
@@ -25,10 +25,10 @@ set_target_properties(chapter3-bindings PROPERTIES
 )
 
 target_link_libraries(chapter3-bindings PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
+    Qt6::Quick
 )
 
 qt_add_qml_module(chapter3-bindings
diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt
index 3914819640..c53083a6e7 100644
--- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt
@@ -26,10 +26,10 @@ set_target_properties(chapter4-customPropertyTypes PROPERTIES
 )
 
 target_link_libraries(chapter4-customPropertyTypes PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
+    Qt6::Quick
 )
 #![1]
 qt_add_qml_module(chapter4-customPropertyTypes
diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt
index d3b70f2017..26918833e7 100644
--- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt
@@ -26,10 +26,10 @@ set_target_properties(chapter5-listproperties PROPERTIES
 )
 
 target_link_libraries(chapter5-listproperties PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
+    Qt6::Quick
 )
 
 qt_add_qml_module(chapter5-listproperties
diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt
index f1a7ef1b51..ad5c2509bb 100644
--- a/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt
@@ -24,8 +24,8 @@ set_target_properties(chapter6-plugins PROPERTIES
 )
 
 target_link_libraries(chapter6-plugins PRIVATE
-    Qt::Qml
-    Qt::Quick
+    Qt6::Qml
+    Qt6::Quick
 )
 
 qt_add_qml_module(chapter6-plugins
diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt
index 4a8f2e0b7b..2d42a62bee 100644
--- a/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt
+++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt
@@ -14,10 +14,10 @@ target_sources(chartsplugin PRIVATE
 )
 
 target_link_libraries(chartsplugin PRIVATE
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
-    Qt::Quick
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Qml
+    Qt6::Quick
 )
 
 if(QT6_IS_SHARED_LIBS_BUILD AND APPLE)