diff options
author | Kai Köhne <[email protected]> | 2023-04-28 13:21:38 +0200 |
---|---|---|
committer | Kai Köhne <[email protected]> | 2023-05-02 12:12:35 +0200 |
commit | 2e6403f8bf950cf3e4802319e41ac1ae368c0586 (patch) | |
tree | 732b271752f4b5840c4e485bb1dc9521542b4421 | |
parent | 8db22d191f6d153cfe950697e89f535062410b83 (diff) |
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 <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
108 files changed, 418 insertions, 418 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 57d9fa87d2..e36a8fd4a7 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -4,13 +4,13 @@ qt_examples_build_begin(EXTERNAL_BUILD) add_subdirectory(qml) -if(TARGET Qt::QuickTest) +if(TARGET Qt6::QuickTest) add_subdirectory(qmltest) endif() -if(TARGET Qt::Quick) +if(TARGET Qt6::Quick) add_subdirectory(quick) endif() -if(TARGET Qt::QuickTemplates2) +if(TARGET Qt6::QuickTemplates2) add_subdirectory(quickcontrols) endif() 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) diff --git a/examples/qmltest/qmltest/CMakeLists.txt b/examples/qmltest/qmltest/CMakeLists.txt index 2fa3c0898c..12fb6d1116 100644 --- a/examples/qmltest/qmltest/CMakeLists.txt +++ b/examples/qmltest/qmltest/CMakeLists.txt @@ -25,18 +25,18 @@ set_target_properties(tst_qmltestexample PROPERTIES ) target_link_libraries(tst_qmltestexample PUBLIC - Qt::Core - Qt::Gui + Qt6::Core + Qt6::Gui - Qt::QuickTest + Qt6::QuickTest ) # This line get added, but does not make sense #if(QT_BUILDING_QT) # target_link_libraries(tst_qmltestexample PUBLIC -# Qt::Qml -# Qt::QuickTest +# Qt6::Qml +# Qt6::QuickTest # ) #endif() diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt index f063585486..7284d58c6f 100644 --- a/examples/quick/CMakeLists.txt +++ b/examples/quick/CMakeLists.txt @@ -34,10 +34,10 @@ add_subdirectory(multieffect) if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) add_subdirectory(rendercontrol) endif() -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(embeddedinwidgets) endif() -if(TARGET Qt::QuickWidgets AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) +if(TARGET Qt6::QuickWidgets AND TARGET Qt6::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(quickwidgets) endif() @@ -70,7 +70,7 @@ set(reused_dir_targets foreach(target IN LISTS reused_dir_targets) if(TARGET ${target}) qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS moc rcc) - if(TARGET Qt::Widgets) + if(TARGET Qt6::Widgets) qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS uic) endif() endif() diff --git a/examples/quick/animation/CMakeLists.txt b/examples/quick/animation/CMakeLists.txt index aa7f0de6d9..624f812195 100644 --- a/examples/quick/animation/CMakeLists.txt +++ b/examples/quick/animation/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(animationexample ) target_link_libraries(animationexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(animationexample animation_shared) diff --git a/examples/quick/canvas/CMakeLists.txt b/examples/quick/canvas/CMakeLists.txt index 7957e007be..7d5b4b6581 100644 --- a/examples/quick/canvas/CMakeLists.txt +++ b/examples/quick/canvas/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(canvasexample ) target_link_libraries(canvasexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(canvasexample diff --git a/examples/quick/customitems/dialcontrol/CMakeLists.txt b/examples/quick/customitems/dialcontrol/CMakeLists.txt index f07816206c..da97def218 100644 --- a/examples/quick/customitems/dialcontrol/CMakeLists.txt +++ b/examples/quick/customitems/dialcontrol/CMakeLists.txt @@ -26,10 +26,10 @@ set_target_properties(dialcontrolexample PROPERTIES ) target_link_libraries(dialcontrolexample PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(dialcontrolexample diff --git a/examples/quick/customitems/flipable/CMakeLists.txt b/examples/quick/customitems/flipable/CMakeLists.txt index 8c51b7b457..2f4a402ed5 100644 --- a/examples/quick/customitems/flipable/CMakeLists.txt +++ b/examples/quick/customitems/flipable/CMakeLists.txt @@ -24,10 +24,10 @@ qt_add_executable(flipableexample ) target_link_libraries(flipableexample PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(flipableexample diff --git a/examples/quick/customitems/maskedmousearea/CMakeLists.txt b/examples/quick/customitems/maskedmousearea/CMakeLists.txt index 8c768bbc56..3afa2ed41a 100644 --- a/examples/quick/customitems/maskedmousearea/CMakeLists.txt +++ b/examples/quick/customitems/maskedmousearea/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(maskedmousearea PROPERTIES ) target_link_libraries(maskedmousearea PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(maskedmousearea diff --git a/examples/quick/customitems/painteditem/CMakeLists.txt b/examples/quick/customitems/painteditem/CMakeLists.txt index 49c1e4f0d0..b9f608da0f 100644 --- a/examples/quick/customitems/painteditem/CMakeLists.txt +++ b/examples/quick/customitems/painteditem/CMakeLists.txt @@ -28,10 +28,10 @@ qt_add_qml_module(painteditemexample ) target_link_libraries(painteditemexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(painteditemexample qmltextballoon) diff --git a/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt b/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt index 472d049ffb..72e7ebc574 100644 --- a/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt +++ b/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt @@ -15,10 +15,10 @@ qt_add_qml_module(qmltextballoon ) target_link_libraries(qmltextballoon PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS qmltextballoon diff --git a/examples/quick/delegatechooser/CMakeLists.txt b/examples/quick/delegatechooser/CMakeLists.txt index ea991b5840..0954fda17a 100644 --- a/examples/quick/delegatechooser/CMakeLists.txt +++ b/examples/quick/delegatechooser/CMakeLists.txt @@ -19,10 +19,10 @@ add_subdirectory("../shared" "shared") qt_add_executable(delegatechooserexample WIN32 MACOSX_BUNDLE main.cpp) target_link_libraries(delegatechooserexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(delegatechooserexample delegatechooser_shared) diff --git a/examples/quick/draganddrop/CMakeLists.txt b/examples/quick/draganddrop/CMakeLists.txt index 0b1755c231..b24eb4676f 100644 --- a/examples/quick/draganddrop/CMakeLists.txt +++ b/examples/quick/draganddrop/CMakeLists.txt @@ -34,10 +34,10 @@ qt_add_qml_module(draganddropexample ) target_link_libraries(draganddropexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(draganddropexample draganddrop_shared) diff --git a/examples/quick/embeddedinwidgets/CMakeLists.txt b/examples/quick/embeddedinwidgets/CMakeLists.txt index 7b975dbb47..dac1a614de 100644 --- a/examples/quick/embeddedinwidgets/CMakeLists.txt +++ b/examples/quick/embeddedinwidgets/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(embeddedinwidgetsexample WIN32 MACOSX_BUNDLE ) target_link_libraries(embeddedinwidgetsexample PRIVATE - Qt::Core - Qt::Gui - Qt::Quick - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::Widgets ) # Resources: diff --git a/examples/quick/externaldraganddrop/CMakeLists.txt b/examples/quick/externaldraganddrop/CMakeLists.txt index 49820ac6f4..576e848356 100644 --- a/examples/quick/externaldraganddrop/CMakeLists.txt +++ b/examples/quick/externaldraganddrop/CMakeLists.txt @@ -28,10 +28,10 @@ qt_add_qml_module(externaldraganddropexample ) target_link_libraries(externaldraganddropexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS externaldraganddropexample diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt index 4b86a03923..55013ed1c7 100644 --- a/examples/quick/imageelements/CMakeLists.txt +++ b/examples/quick/imageelements/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(imageelementsexample ) target_link_libraries(imageelementsexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(imageelementsexample diff --git a/examples/quick/imageprovider/CMakeLists.txt b/examples/quick/imageprovider/CMakeLists.txt index 4a158fd4be..39d5e23bb3 100644 --- a/examples/quick/imageprovider/CMakeLists.txt +++ b/examples/quick/imageprovider/CMakeLists.txt @@ -35,10 +35,10 @@ set_target_properties(qmlimageproviderplugin PROPERTIES ) target_link_libraries(qmlimageproviderplugin PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS qmlimageproviderplugin diff --git a/examples/quick/imageresponseprovider/CMakeLists.txt b/examples/quick/imageresponseprovider/CMakeLists.txt index ad3ff77758..84b1a177fd 100644 --- a/examples/quick/imageresponseprovider/CMakeLists.txt +++ b/examples/quick/imageresponseprovider/CMakeLists.txt @@ -35,10 +35,10 @@ set_target_properties(qmlimageresponseproviderplugin PROPERTIES ) target_link_libraries(qmlimageresponseproviderplugin PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS qmlimageresponseproviderplugin diff --git a/examples/quick/itemvariablerefreshrate/CMakeLists.txt b/examples/quick/itemvariablerefreshrate/CMakeLists.txt index 2b6c4fe26d..8d795372bc 100644 --- a/examples/quick/itemvariablerefreshrate/CMakeLists.txt +++ b/examples/quick/itemvariablerefreshrate/CMakeLists.txt @@ -21,10 +21,10 @@ qt_add_executable(itemvariablerefreshrateexample ) target_link_libraries(itemvariablerefreshrateexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(itemvariablerefreshrateexample diff --git a/examples/quick/keyinteraction/CMakeLists.txt b/examples/quick/keyinteraction/CMakeLists.txt index 58c9e9f0d5..ad4903fdb9 100644 --- a/examples/quick/keyinteraction/CMakeLists.txt +++ b/examples/quick/keyinteraction/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(keyinteractionexample WIN32 MACOSX_BUNDLE ) target_link_libraries(keyinteractionexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/quick/layouts/CMakeLists.txt b/examples/quick/layouts/CMakeLists.txt index 679dda27e8..99427e1a00 100644 --- a/examples/quick/layouts/CMakeLists.txt +++ b/examples/quick/layouts/CMakeLists.txt @@ -27,10 +27,10 @@ qt_add_qml_module(layoutsexample ) target_link_libraries(layoutsexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS layoutsexample diff --git a/examples/quick/localstorage/CMakeLists.txt b/examples/quick/localstorage/CMakeLists.txt index 495db588e8..389f41b206 100644 --- a/examples/quick/localstorage/CMakeLists.txt +++ b/examples/quick/localstorage/CMakeLists.txt @@ -31,10 +31,10 @@ qt_add_qml_module(localstorageexample ) target_link_libraries(localstorageexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS localstorageexample diff --git a/examples/quick/models/abstractitemmodel/CMakeLists.txt b/examples/quick/models/abstractitemmodel/CMakeLists.txt index 687685c538..9e148dd07d 100644 --- a/examples/quick/models/abstractitemmodel/CMakeLists.txt +++ b/examples/quick/models/abstractitemmodel/CMakeLists.txt @@ -20,10 +20,10 @@ qt_add_executable(abstractitemmodelexample WIN32 MACOSX_BUNDLE ) target_link_libraries(abstractitemmodelexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/quick/models/objectlistmodel/CMakeLists.txt b/examples/quick/models/objectlistmodel/CMakeLists.txt index f0da3b4467..ad95963cd6 100644 --- a/examples/quick/models/objectlistmodel/CMakeLists.txt +++ b/examples/quick/models/objectlistmodel/CMakeLists.txt @@ -20,10 +20,10 @@ qt_add_executable(objectlistmodelexample WIN32 MACOSX_BUNDLE ) target_link_libraries(objectlistmodelexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/quick/models/stringlistmodel/CMakeLists.txt b/examples/quick/models/stringlistmodel/CMakeLists.txt index b74be36d65..9e08f094ba 100644 --- a/examples/quick/models/stringlistmodel/CMakeLists.txt +++ b/examples/quick/models/stringlistmodel/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(stringlistmodelexample WIN32 MACOSX_BUNDLE ) target_link_libraries(stringlistmodelexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/quick/mousearea/CMakeLists.txt b/examples/quick/mousearea/CMakeLists.txt index 925d94ac1b..cd12c6a451 100644 --- a/examples/quick/mousearea/CMakeLists.txt +++ b/examples/quick/mousearea/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(mouseareaexample WIN32 MACOSX_BUNDLE ) target_link_libraries(mouseareaexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/quick/multieffect/itemswitcher/CMakeLists.txt b/examples/quick/multieffect/itemswitcher/CMakeLists.txt index bd598d1f5f..bb95b1f6f4 100644 --- a/examples/quick/multieffect/itemswitcher/CMakeLists.txt +++ b/examples/quick/multieffect/itemswitcher/CMakeLists.txt @@ -21,11 +21,11 @@ qt_add_executable(itemswitcherexample WIN32 MACOSX_BUNDLE ) target_link_libraries(itemswitcherexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick + Qt6::QuickControls2 ) add_dependencies(itemswitcherexample itemswitcher_shared) diff --git a/examples/quick/multieffect/testbed/CMakeLists.txt b/examples/quick/multieffect/testbed/CMakeLists.txt index 4461a8a13e..6a05b5f8a6 100644 --- a/examples/quick/multieffect/testbed/CMakeLists.txt +++ b/examples/quick/multieffect/testbed/CMakeLists.txt @@ -21,11 +21,11 @@ qt_add_executable(testbedexample WIN32 MACOSX_BUNDLE ) target_link_libraries(testbedexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick + Qt6::QuickControls2 ) add_dependencies(testbedexample testbed_shared) diff --git a/examples/quick/particles/affectors/CMakeLists.txt b/examples/quick/particles/affectors/CMakeLists.txt index 0eb7dbc02d..910d751bc9 100644 --- a/examples/quick/particles/affectors/CMakeLists.txt +++ b/examples/quick/particles/affectors/CMakeLists.txt @@ -21,10 +21,10 @@ qt_add_executable(affectorsexample WIN32 MACOSX_BUNDLE ) target_link_libraries(affectorsexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(affectorsexample affectors_shared) diff --git a/examples/quick/particles/emitters/CMakeLists.txt b/examples/quick/particles/emitters/CMakeLists.txt index defaa297f1..a398252ca2 100644 --- a/examples/quick/particles/emitters/CMakeLists.txt +++ b/examples/quick/particles/emitters/CMakeLists.txt @@ -21,10 +21,10 @@ qt_add_executable(emittersexample WIN32 MACOSX_BUNDLE ) target_link_libraries(emittersexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(emittersexample emitters_shared) diff --git a/examples/quick/particles/imageparticle/CMakeLists.txt b/examples/quick/particles/imageparticle/CMakeLists.txt index 1bcf3b388d..c55e5e7afc 100644 --- a/examples/quick/particles/imageparticle/CMakeLists.txt +++ b/examples/quick/particles/imageparticle/CMakeLists.txt @@ -21,10 +21,10 @@ qt_add_executable(imageparticleexample WIN32 MACOSX_BUNDLE ) target_link_libraries(imageparticleexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(imageparticleexample imageparticle_shared) diff --git a/examples/quick/particles/itemparticle/CMakeLists.txt b/examples/quick/particles/itemparticle/CMakeLists.txt index ca3522e256..a2dcb8cf2f 100644 --- a/examples/quick/particles/itemparticle/CMakeLists.txt +++ b/examples/quick/particles/itemparticle/CMakeLists.txt @@ -21,10 +21,10 @@ qt_add_executable(itemparticleexample WIN32 MACOSX_BUNDLE ) target_link_libraries(itemparticleexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(itemparticleexample itemparticle_shared) diff --git a/examples/quick/particles/system/CMakeLists.txt b/examples/quick/particles/system/CMakeLists.txt index f72ce58e3b..0c36a861ea 100644 --- a/examples/quick/particles/system/CMakeLists.txt +++ b/examples/quick/particles/system/CMakeLists.txt @@ -21,10 +21,10 @@ qt_add_executable(systemexample WIN32 MACOSX_BUNDLE ) target_link_libraries(systemexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(systemexample system_shared) diff --git a/examples/quick/pointerhandlers/CMakeLists.txt b/examples/quick/pointerhandlers/CMakeLists.txt index 0e870195a2..1f79a4b4ae 100644 --- a/examples/quick/pointerhandlers/CMakeLists.txt +++ b/examples/quick/pointerhandlers/CMakeLists.txt @@ -19,11 +19,11 @@ add_subdirectory("../shared" "shared") qt_add_executable(pointerhandlersexample WIN32 MACOSX_BUNDLE main.cpp) target_link_libraries(pointerhandlersexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::Svg + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick + Qt6::Svg ) add_dependencies(pointerhandlersexample pointerhandlers_shared) diff --git a/examples/quick/positioners/CMakeLists.txt b/examples/quick/positioners/CMakeLists.txt index 6b1eda067b..2b994c6000 100644 --- a/examples/quick/positioners/CMakeLists.txt +++ b/examples/quick/positioners/CMakeLists.txt @@ -31,10 +31,10 @@ qt_add_qml_module(positionersexample ) target_link_libraries(positionersexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS positionersexample diff --git a/examples/quick/quick-accessibility/CMakeLists.txt b/examples/quick/quick-accessibility/CMakeLists.txt index bec855f963..f93be39fcf 100644 --- a/examples/quick/quick-accessibility/CMakeLists.txt +++ b/examples/quick/quick-accessibility/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(quick-accessibility ) target_link_libraries(quick-accessibility PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(quick-accessibility diff --git a/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt b/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt index 7fdbcd4838..d1e920444d 100644 --- a/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt +++ b/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt @@ -24,11 +24,11 @@ qt_add_executable(qquickwidgetversuswindow_opengl ) target_link_libraries(qquickwidgetversuswindow_opengl PRIVATE - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickWidgets - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickWidgets + Qt6::Widgets ) qt_add_qml_module(qquickwidgetversuswindow_opengl diff --git a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt index 35b29629fd..139030749f 100644 --- a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt +++ b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt @@ -21,11 +21,11 @@ qt_add_executable(quickwidget ) target_link_libraries(quickwidget PRIVATE - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickWidgets - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickWidgets + Qt6::Widgets ) qt_add_qml_module(quickwidget diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt index c99fc57127..1d37ccd3f6 100644 --- a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt +++ b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(rendercontrol_d3d11example WIN32 MACOSX_BUNDLE ) target_link_libraries(rendercontrol_d3d11example PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick d3d11 dxgi dxguid diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt index aa5dc7422b..34f1efa181 100644 --- a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt +++ b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt @@ -21,11 +21,11 @@ qt_add_executable(rendercontrol_openglexample WIN32 MACOSX_BUNDLE ) target_link_libraries(rendercontrol_openglexample PRIVATE - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::Qml + Qt6::Quick ) # Resources: diff --git a/examples/quick/righttoleft/CMakeLists.txt b/examples/quick/righttoleft/CMakeLists.txt index 421bc8cb90..f9ba310dfc 100644 --- a/examples/quick/righttoleft/CMakeLists.txt +++ b/examples/quick/righttoleft/CMakeLists.txt @@ -32,10 +32,10 @@ qt_add_qml_module(righttoleftexample ) target_link_libraries(righttoleftexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS righttoleftexample diff --git a/examples/quick/scenegraph/customgeometry/CMakeLists.txt b/examples/quick/scenegraph/customgeometry/CMakeLists.txt index 5662266f41..2e886478d4 100644 --- a/examples/quick/scenegraph/customgeometry/CMakeLists.txt +++ b/examples/quick/scenegraph/customgeometry/CMakeLists.txt @@ -20,9 +20,9 @@ qt_add_executable(customgeometry_declarative WIN32 MACOSX_BUNDLE ) target_link_libraries(customgeometry_declarative PRIVATE - Qt::Core - Qt::Gui - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Quick ) qt_add_qml_module(customgeometry_declarative diff --git a/examples/quick/scenegraph/custommaterial/CMakeLists.txt b/examples/quick/scenegraph/custommaterial/CMakeLists.txt index eacdd80642..4357b88eef 100644 --- a/examples/quick/scenegraph/custommaterial/CMakeLists.txt +++ b/examples/quick/scenegraph/custommaterial/CMakeLists.txt @@ -20,10 +20,10 @@ qt_add_executable(custommaterial_declarative WIN32 MACOSX_BUNDLE ) target_link_libraries(custommaterial_declarative PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(custommaterial_declarative diff --git a/examples/quick/scenegraph/customrendernode/CMakeLists.txt b/examples/quick/scenegraph/customrendernode/CMakeLists.txt index bff303029a..ada750d56a 100644 --- a/examples/quick/scenegraph/customrendernode/CMakeLists.txt +++ b/examples/quick/scenegraph/customrendernode/CMakeLists.txt @@ -20,10 +20,10 @@ qt_add_executable(customrendernode WIN32 MACOSX_BUNDLE ) target_link_libraries(customrendernode PRIVATE - Qt::Core - Qt::GuiPrivate - Qt::Qml - Qt::QuickPrivate + Qt6::Core + Qt6::GuiPrivate + Qt6::Qml + Qt6::QuickPrivate ) qt_add_qml_module(customrendernode diff --git a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt b/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt index 2a08c39d59..97d6e9fe50 100644 --- a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt +++ b/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(d3d11underqml PROPERTIES ) target_link_libraries(d3d11underqml PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick d3d11 d3dcompiler ) diff --git a/examples/quick/scenegraph/fboitem/CMakeLists.txt b/examples/quick/scenegraph/fboitem/CMakeLists.txt index f3fbce11aa..371c7e31ed 100644 --- a/examples/quick/scenegraph/fboitem/CMakeLists.txt +++ b/examples/quick/scenegraph/fboitem/CMakeLists.txt @@ -25,10 +25,10 @@ target_include_directories(fboitem PUBLIC ) target_link_libraries(fboitem PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(fboitem diff --git a/examples/quick/scenegraph/graph/CMakeLists.txt b/examples/quick/scenegraph/graph/CMakeLists.txt index fee1e498d7..9fc84a1fb4 100644 --- a/examples/quick/scenegraph/graph/CMakeLists.txt +++ b/examples/quick/scenegraph/graph/CMakeLists.txt @@ -28,9 +28,9 @@ set_target_properties(graph PROPERTIES ) target_link_libraries(graph PRIVATE - Qt::Core - Qt::Gui - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Quick ) qt_add_qml_module(graph diff --git a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt index 70cb10dc6a..eeea056612 100644 --- a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt +++ b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt @@ -29,10 +29,10 @@ set_target_properties(metaltextureimport PROPERTIES target_link_libraries(metaltextureimport PUBLIC "-framework Metal" - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) if(MACOS) diff --git a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt index 9bd54c637e..3f34597cd1 100644 --- a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt @@ -26,10 +26,10 @@ set_target_properties(metalunderqml PROPERTIES target_link_libraries(metalunderqml PUBLIC "-framework Metal" - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) if(MACOS) diff --git a/examples/quick/scenegraph/openglunderqml/CMakeLists.txt b/examples/quick/scenegraph/openglunderqml/CMakeLists.txt index cd64bb6172..df424e5be6 100644 --- a/examples/quick/scenegraph/openglunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/openglunderqml/CMakeLists.txt @@ -26,10 +26,10 @@ set_target_properties(openglunderqml PROPERTIES ) target_link_libraries(openglunderqml PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(openglunderqml diff --git a/examples/quick/scenegraph/threadedanimation/CMakeLists.txt b/examples/quick/scenegraph/threadedanimation/CMakeLists.txt index a0e98f5e99..98d66130ca 100644 --- a/examples/quick/scenegraph/threadedanimation/CMakeLists.txt +++ b/examples/quick/scenegraph/threadedanimation/CMakeLists.txt @@ -20,10 +20,10 @@ qt_add_executable(threadedanimation WIN32 MACOSX_BUNDLE ) target_link_libraries(threadedanimation PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(threadedanimation diff --git a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt index 153b9d123b..b175dd2d53 100644 --- a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt +++ b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt @@ -20,10 +20,10 @@ qt_add_executable(twotextureproviders WIN32 MACOSX_BUNDLE ) target_link_libraries(twotextureproviders PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(twotextureproviders diff --git a/examples/quick/scenegraph/vulkantextureimport/CMakeLists.txt b/examples/quick/scenegraph/vulkantextureimport/CMakeLists.txt index 246fb2d6d2..bc81507214 100644 --- a/examples/quick/scenegraph/vulkantextureimport/CMakeLists.txt +++ b/examples/quick/scenegraph/vulkantextureimport/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(vulkantextureimport PROPERTIES ) target_link_libraries(vulkantextureimport PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(vulkantextureimport diff --git a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt index 79cbc60477..c811431e2c 100644 --- a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(vulkanunderqml PROPERTIES ) target_link_libraries(vulkanunderqml PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(vulkanunderqml diff --git a/examples/quick/shadereffects/CMakeLists.txt b/examples/quick/shadereffects/CMakeLists.txt index e975190332..db16e757cc 100644 --- a/examples/quick/shadereffects/CMakeLists.txt +++ b/examples/quick/shadereffects/CMakeLists.txt @@ -21,10 +21,10 @@ qt_add_executable(shadereffectsexample ) target_link_libraries(shadereffectsexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(shadereffectsexample diff --git a/examples/quick/shapes/CMakeLists.txt b/examples/quick/shapes/CMakeLists.txt index 37ed8aa561..db80983dca 100644 --- a/examples/quick/shapes/CMakeLists.txt +++ b/examples/quick/shapes/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(shapesexample ) target_link_libraries(shapesexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(shapesexample shapes_shared) diff --git a/examples/quick/tableview/gameoflife/CMakeLists.txt b/examples/quick/tableview/gameoflife/CMakeLists.txt index 7b17a666dd..e3000268a0 100644 --- a/examples/quick/tableview/gameoflife/CMakeLists.txt +++ b/examples/quick/tableview/gameoflife/CMakeLists.txt @@ -24,10 +24,10 @@ qt_add_executable(gameoflife ) target_link_libraries(gameoflife PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(gameoflife diff --git a/examples/quick/tableview/pixelator/CMakeLists.txt b/examples/quick/tableview/pixelator/CMakeLists.txt index 21264df356..62d40704cb 100644 --- a/examples/quick/tableview/pixelator/CMakeLists.txt +++ b/examples/quick/tableview/pixelator/CMakeLists.txt @@ -24,10 +24,10 @@ qt_add_executable(qml_pixelator ) target_link_libraries(qml_pixelator PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(qml_pixelator diff --git a/examples/quick/text/CMakeLists.txt b/examples/quick/text/CMakeLists.txt index 463fb4ec53..e4b7af6901 100644 --- a/examples/quick/text/CMakeLists.txt +++ b/examples/quick/text/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(textexample ) target_link_libraries(textexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(textexample text_shared) diff --git a/examples/quick/threading/CMakeLists.txt b/examples/quick/threading/CMakeLists.txt index aaa1731f0d..d23a5191a8 100644 --- a/examples/quick/threading/CMakeLists.txt +++ b/examples/quick/threading/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(threadingexample ) target_link_libraries(threadingexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(threadingexample threading_shared) diff --git a/examples/quick/touchinteraction/CMakeLists.txt b/examples/quick/touchinteraction/CMakeLists.txt index 39cd50e5f5..6b27f3828b 100644 --- a/examples/quick/touchinteraction/CMakeLists.txt +++ b/examples/quick/touchinteraction/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(touchinteractionexample ) target_link_libraries(touchinteractionexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(touchinteractionexample touchinteraction_shared) diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt index e99a4a18e9..e10028eef4 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt @@ -33,10 +33,10 @@ qt_add_qml_module(dynamicview1 ) target_link_libraries(dynamicview1 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS dynamicview1 diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt index 37d6adb8f1..1db3a607cb 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt @@ -33,10 +33,10 @@ qt_add_qml_module(dynamicview2 ) target_link_libraries(dynamicview2 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS dynamicview2 diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt index 1257110860..8faac18af5 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt @@ -33,10 +33,10 @@ qt_add_qml_module(dynamicview3 ) target_link_libraries(dynamicview3 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS dynamicview3 diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt index a1c4705c65..38a7216f88 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt @@ -34,10 +34,10 @@ qt_add_qml_module(dynamicview4 ) target_link_libraries(dynamicview4 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS dynamicview4 diff --git a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt index 7886f4573d..25ce91323f 100644 --- a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt @@ -37,10 +37,10 @@ qt_add_qml_module(samegame1 ) target_link_libraries(samegame1 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS samegame1 diff --git a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt index 29c8d74bf4..698a4b5556 100644 --- a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt @@ -38,10 +38,10 @@ qt_add_qml_module(samegame2 ) target_link_libraries(samegame2 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS samegame2 diff --git a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt index def9f5f8a3..1972528f84 100644 --- a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt @@ -41,10 +41,10 @@ qt_add_qml_module(samegame3 ) target_link_libraries(samegame3 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS samegame3 diff --git a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt index 0ed15f4e2a..d93bcb0fba 100644 --- a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt @@ -48,10 +48,10 @@ qt_add_qml_module(samegame4 ) target_link_libraries(samegame4 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS samegame4 diff --git a/examples/quick/views/CMakeLists.txt b/examples/quick/views/CMakeLists.txt index 1ce809977c..c3370d452d 100644 --- a/examples/quick/views/CMakeLists.txt +++ b/examples/quick/views/CMakeLists.txt @@ -28,10 +28,10 @@ set_target_properties(viewsexample PROPERTIES ) target_link_libraries(viewsexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) add_dependencies(viewsexample views_shared) diff --git a/examples/quick/window/CMakeLists.txt b/examples/quick/window/CMakeLists.txt index cb69ec4b36..8dbc7ea430 100644 --- a/examples/quick/window/CMakeLists.txt +++ b/examples/quick/window/CMakeLists.txt @@ -23,10 +23,10 @@ qt_add_executable(windowexample ) target_link_libraries(windowexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_add_qml_module(windowexample diff --git a/examples/quickcontrols/CMakeLists.txt b/examples/quickcontrols/CMakeLists.txt index 6a57993511..b25eebc651 100644 --- a/examples/quickcontrols/CMakeLists.txt +++ b/examples/quickcontrols/CMakeLists.txt @@ -3,10 +3,10 @@ qt_internal_add_example(attachedstyleproperties) qt_internal_add_example(gallery) -if (TARGET Qt::Sql) +if (TARGET Qt6::Sql) add_subdirectory(chattutorial) endif() -if (QT_FEATURE_quicktemplates2_calendar AND TARGET Qt::Sql) +if (QT_FEATURE_quicktemplates2_calendar AND TARGET Qt6::Sql) qt_internal_add_example(eventcalendar) endif() qt_internal_add_example(texteditor) @@ -15,6 +15,6 @@ qt_internal_add_example(wearable) qt_internal_add_example(imagine/automotive) qt_internal_add_example(imagine/musicplayer) qt_internal_add_example(filesystemexplorer) -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(flatstyle) endif() diff --git a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt index d08d238e46..5c5536aace 100644 --- a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt +++ b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt @@ -29,10 +29,10 @@ qt_add_qml_module(attachedstylepropertiesexample ) target_link_libraries(attachedstylepropertiesexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::QuickControls2 ) add_dependencies(attachedstylepropertiesexample MyStyle) diff --git a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt index 9cb00a81e7..f57aacdd41 100644 --- a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt +++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt @@ -28,10 +28,10 @@ generate_export_header(MyStyle) find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml QuickControls2) target_link_libraries(MyStyle PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::QuickControls2 ) install(TARGETS MyStyle diff --git a/examples/quickcontrols/chattutorial/CMakeLists.txt b/examples/quickcontrols/chattutorial/CMakeLists.txt index 3a73a7380b..12f6ecfd11 100644 --- a/examples/quickcontrols/chattutorial/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_example(chapter1) qt_internal_add_example(chapter2) qt_internal_add_example(chapter3) -if (TARGET Qt::Sql) +if (TARGET Qt6::Sql) qt_internal_add_example(chapter4) if(TARGET chattutorial-chapter4) set_target_properties(chattutorial-chapter4 PROPERTIES UNITY_BUILD OFF) diff --git a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt index 549790b9e8..80be9d275e 100644 --- a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(chattutorial-chapter1 WIN32 MACOSX_BUNDLE ) target_link_libraries(chattutorial-chapter1 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_policy(SET QTP0001 NEW) diff --git a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt index 561861afc0..bc531ef529 100644 --- a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(chattutorial-chapter2 WIN32 MACOSX_BUNDLE ) target_link_libraries(chattutorial-chapter2 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_policy(SET QTP0001 NEW) diff --git a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt index 92ac5683fd..ad853842f2 100644 --- a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(chattutorial-chapter3 WIN32 MACOSX_BUNDLE ) target_link_libraries(chattutorial-chapter3 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) qt_policy(SET QTP0001 NEW) diff --git a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt index cc56b319e7..a962c10a53 100644 --- a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt @@ -21,11 +21,11 @@ qt_add_executable(chattutorial-chapter4 WIN32 MACOSX_BUNDLE ) target_link_libraries(chattutorial-chapter4 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::Sql + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick + Qt6::Sql ) qt_policy(SET QTP0001 NEW) diff --git a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt index dfffa0f6de..72afb7888b 100644 --- a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt @@ -21,11 +21,11 @@ qt_add_executable(chattutorial-chapter5 WIN32 MACOSX_BUNDLE ) target_link_libraries(chattutorial-chapter5 PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::Sql + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick + Qt6::Sql ) qt_policy(SET QTP0001 NEW) diff --git a/examples/quickcontrols/contactlist/CMakeLists.txt b/examples/quickcontrols/contactlist/CMakeLists.txt index d353e3374f..2024157a9c 100644 --- a/examples/quickcontrols/contactlist/CMakeLists.txt +++ b/examples/quickcontrols/contactlist/CMakeLists.txt @@ -33,9 +33,9 @@ qt_add_qml_module(contactlistexample ) target_link_libraries(contactlistexample PUBLIC - Qt::Core - Qt::Gui - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Quick ) install(TARGETS contactlistexample diff --git a/examples/quickcontrols/eventcalendar/CMakeLists.txt b/examples/quickcontrols/eventcalendar/CMakeLists.txt index 92299b1870..a88982b05f 100644 --- a/examples/quickcontrols/eventcalendar/CMakeLists.txt +++ b/examples/quickcontrols/eventcalendar/CMakeLists.txt @@ -27,10 +27,10 @@ set_target_properties(eventcalendar PROPERTIES ) target_link_libraries(eventcalendar PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Sql + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Sql ) qt_add_qml_module(eventcalendar diff --git a/examples/quickcontrols/flatstyle/CMakeLists.txt b/examples/quickcontrols/flatstyle/CMakeLists.txt index c505c03bca..00b35ec980 100644 --- a/examples/quickcontrols/flatstyle/CMakeLists.txt +++ b/examples/quickcontrols/flatstyle/CMakeLists.txt @@ -35,11 +35,11 @@ qt_add_qml_module(flatstyleexample ) target_link_libraries(flatstyleexample PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickControls2 - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickControls2 + Qt6::Widgets ) install(TARGETS flatstyleexample diff --git a/examples/quickcontrols/gallery/CMakeLists.txt b/examples/quickcontrols/gallery/CMakeLists.txt index baa7d948f1..fc5d14078c 100644 --- a/examples/quickcontrols/gallery/CMakeLists.txt +++ b/examples/quickcontrols/gallery/CMakeLists.txt @@ -83,17 +83,17 @@ qt_add_qml_module(galleryexample ) target_link_libraries(galleryexample PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickControls2 ) if(UNIX AND NOT APPLE AND CMAKE_CROSSCOMPILING) find_package(Qt6 REQUIRED COMPONENTS QuickTemplates2) # Work around QTBUG-86533 - target_link_libraries(galleryexample PRIVATE Qt::QuickTemplates2) + target_link_libraries(galleryexample PRIVATE Qt6::QuickTemplates2) endif() install(TARGETS galleryexample diff --git a/examples/quickcontrols/imagine/automotive/CMakeLists.txt b/examples/quickcontrols/imagine/automotive/CMakeLists.txt index 94e79a10a8..c5cf8e9885 100644 --- a/examples/quickcontrols/imagine/automotive/CMakeLists.txt +++ b/examples/quickcontrols/imagine/automotive/CMakeLists.txt @@ -132,10 +132,10 @@ qt_add_qml_module(automotiveexample ) target_link_libraries(automotiveexample PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickControls2 ) install(TARGETS automotiveexample diff --git a/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt index cc3d5b27b0..9adc56f86e 100644 --- a/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt +++ b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt @@ -174,10 +174,10 @@ qt_add_qml_module(musicplayerexample ) target_link_libraries(musicplayerexample PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickControls2 ) install(TARGETS musicplayerexample diff --git a/examples/quickcontrols/texteditor/CMakeLists.txt b/examples/quickcontrols/texteditor/CMakeLists.txt index 37c86142da..2736881e68 100644 --- a/examples/quickcontrols/texteditor/CMakeLists.txt +++ b/examples/quickcontrols/texteditor/CMakeLists.txt @@ -33,15 +33,15 @@ qt_add_qml_module(texteditorexample ) target_link_libraries(texteditorexample PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickControls2 ) -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) target_link_libraries(texteditorexample PUBLIC - Qt::Widgets + Qt6::Widgets ) endif() diff --git a/examples/quickcontrols/wearable/CMakeLists.txt b/examples/quickcontrols/wearable/CMakeLists.txt index 2963040b79..8b264ef1c4 100644 --- a/examples/quickcontrols/wearable/CMakeLists.txt +++ b/examples/quickcontrols/wearable/CMakeLists.txt @@ -24,17 +24,17 @@ set_target_properties(wearable PROPERTIES ) target_link_libraries(wearable PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickControls2 + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickControls2 ) if(UNIX AND NOT APPLE AND CMAKE_CROSSCOMPILING) find_package(Qt6 REQUIRED COMPONENTS QuickTemplates2) # Work around QTBUG-86533 - target_link_libraries(wearable PRIVATE Qt::QuickTemplates2) + target_link_libraries(wearable PRIVATE Qt6::QuickTemplates2) endif() # Resources: |