diff options
78 files changed, 185 insertions, 156 deletions
diff --git a/examples/qml/networkaccessmanagerfactory/CMakeLists.txt b/examples/qml/networkaccessmanagerfactory/CMakeLists.txt index 640d28a8e9..2d0821b40e 100644 --- a/examples/qml/networkaccessmanagerfactory/CMakeLists.txt +++ b/examples/qml/networkaccessmanagerfactory/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/networkaccessmanagerfactory") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -28,6 +28,7 @@ target_link_libraries(networkaccessmanagerfactory PUBLIC Qt::Quick ) + # Resources: set(networkaccessmanagerfactory_resource_files "view.qml" @@ -40,7 +41,6 @@ qt6_add_resources(networkaccessmanagerfactory "networkaccessmanagerfactory" ${networkaccessmanagerfactory_resource_files} ) - install(TARGETS networkaccessmanagerfactory RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/qmlextensionplugins/CMakeLists.txt b/examples/qml/qmlextensionplugins/CMakeLists.txt index 44cf493b9b..0a285db409 100644 --- a/examples/qml/qmlextensionplugins/CMakeLists.txt +++ b/examples/qml/qmlextensionplugins/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/qmlextensionplugins/imports/TimeExample") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/qml/referenceexamples/adding/CMakeLists.txt b/examples/qml/referenceexamples/adding/CMakeLists.txt index 01f3fc2f15..6a75d83d01 100644 --- a/examples/qml/referenceexamples/adding/CMakeLists.txt +++ b/examples/qml/referenceexamples/adding/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/adding") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Qml) @@ -23,6 +23,7 @@ target_link_libraries(adding PUBLIC Qt::Qml ) + # Resources: set(adding_resource_files "example.qml" @@ -35,7 +36,6 @@ qt6_add_resources(adding "adding" ${adding_resource_files} ) - install(TARGETS adding RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/attached/CMakeLists.txt b/examples/qml/referenceexamples/attached/CMakeLists.txt index dc1556c36a..adc8c4660a 100644 --- a/examples/qml/referenceexamples/attached/CMakeLists.txt +++ b/examples/qml/referenceexamples/attached/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/attached") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(attached PUBLIC Qt::Qml ) + # Resources: set(attached_resource_files "example.qml" @@ -38,7 +39,6 @@ qt6_add_resources(attached "attached" ${attached_resource_files} ) - install(TARGETS attached RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/binding/CMakeLists.txt b/examples/qml/referenceexamples/binding/CMakeLists.txt index 97cf022958..876a444cae 100644 --- a/examples/qml/referenceexamples/binding/CMakeLists.txt +++ b/examples/qml/referenceexamples/binding/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/binding") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(binding PUBLIC Qt::Qml ) + # Resources: set(binding_resource_files "example.qml" @@ -39,7 +40,6 @@ qt6_add_resources(binding "binding" ${binding_resource_files} ) - install(TARGETS binding RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/coercion/CMakeLists.txt b/examples/qml/referenceexamples/coercion/CMakeLists.txt index 0e7d7d0add..32b4a0a8ab 100644 --- a/examples/qml/referenceexamples/coercion/CMakeLists.txt +++ b/examples/qml/referenceexamples/coercion/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/coercion") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Qml) @@ -24,6 +24,7 @@ target_link_libraries(coercion PUBLIC Qt::Qml ) + # Resources: set(coercion_resource_files "example.qml" @@ -36,7 +37,6 @@ qt6_add_resources(coercion "coercion" ${coercion_resource_files} ) - install(TARGETS coercion RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/default/CMakeLists.txt b/examples/qml/referenceexamples/default/CMakeLists.txt index 5b88155416..96522b7efc 100644 --- a/examples/qml/referenceexamples/default/CMakeLists.txt +++ b/examples/qml/referenceexamples/default/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/default") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Qml) @@ -24,6 +24,7 @@ target_link_libraries(default PUBLIC Qt::Qml ) + # Resources: set(default_resource_files "example.qml" @@ -36,7 +37,6 @@ qt6_add_resources(default "default" ${default_resource_files} ) - install(TARGETS default RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/extended/CMakeLists.txt b/examples/qml/referenceexamples/extended/CMakeLists.txt index f049a3780c..72fb391b68 100644 --- a/examples/qml/referenceexamples/extended/CMakeLists.txt +++ b/examples/qml/referenceexamples/extended/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/extended") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(extended PUBLIC Qt::Widgets ) + # Resources: set(extended_resource_files "example.qml" @@ -39,7 +40,6 @@ qt6_add_resources(extended "extended" ${extended_resource_files} ) - install(TARGETS extended RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/grouped/CMakeLists.txt b/examples/qml/referenceexamples/grouped/CMakeLists.txt index 65d9d457a7..b8daa901c0 100644 --- a/examples/qml/referenceexamples/grouped/CMakeLists.txt +++ b/examples/qml/referenceexamples/grouped/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/grouped") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(grouped PUBLIC Qt::Qml ) + # Resources: set(grouped_resource_files "example.qml" @@ -38,7 +39,6 @@ qt6_add_resources(grouped "grouped" ${grouped_resource_files} ) - install(TARGETS grouped RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/methods/CMakeLists.txt b/examples/qml/referenceexamples/methods/CMakeLists.txt index b48094d7e5..e46e62f586 100644 --- a/examples/qml/referenceexamples/methods/CMakeLists.txt +++ b/examples/qml/referenceexamples/methods/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/methods") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Qml) @@ -24,6 +24,7 @@ target_link_libraries(methods PUBLIC Qt::Qml ) + # Resources: set(methods_resource_files "example.qml" @@ -36,7 +37,6 @@ qt6_add_resources(methods "methods" ${methods_resource_files} ) - install(TARGETS methods RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/properties/CMakeLists.txt b/examples/qml/referenceexamples/properties/CMakeLists.txt index 4dd994aeca..e9d8777898 100644 --- a/examples/qml/referenceexamples/properties/CMakeLists.txt +++ b/examples/qml/referenceexamples/properties/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/properties") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Qml) @@ -24,6 +24,7 @@ target_link_libraries(properties PUBLIC Qt::Qml ) + # Resources: set(properties_resource_files "example.qml" @@ -36,7 +37,6 @@ qt6_add_resources(properties "properties" ${properties_resource_files} ) - install(TARGETS properties RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/signal/CMakeLists.txt b/examples/qml/referenceexamples/signal/CMakeLists.txt index e37010fb2b..6a70765f4d 100644 --- a/examples/qml/referenceexamples/signal/CMakeLists.txt +++ b/examples/qml/referenceexamples/signal/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/signal") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(signal PUBLIC Qt::Qml ) + # Resources: set(signal_resource_files "example.qml" @@ -38,7 +39,6 @@ qt6_add_resources(signal "signal" ${signal_resource_files} ) - install(TARGETS signal RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/referenceexamples/valuesource/CMakeLists.txt b/examples/qml/referenceexamples/valuesource/CMakeLists.txt index bca17e4dbc..af06b5c31e 100644 --- a/examples/qml/referenceexamples/valuesource/CMakeLists.txt +++ b/examples/qml/referenceexamples/valuesource/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/referenceexamples/valuesource") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(valuesource PUBLIC Qt::Qml ) + # Resources: set(valuesource_resource_files "example.qml" @@ -39,7 +40,6 @@ qt6_add_resources(valuesource "valuesource" ${valuesource_resource_files} ) - install(TARGETS valuesource RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/shell/CMakeLists.txt b/examples/qml/shell/CMakeLists.txt index 0c376e323a..8e75f4b32b 100644 --- a/examples/qml/shell/CMakeLists.txt +++ b/examples/qml/shell/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/shell") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Qml) diff --git a/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt index de8a5d98b3..daf1af7917 100644 --- a/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/tutorials/extending-qml/chapter1-basics") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(chapter1-basics PUBLIC Qt::Quick ) + # Resources: set(chapter1-basics_resource_files "app.qml" @@ -39,7 +40,6 @@ qt6_add_resources(chapter1-basics "chapter1-basics" ${chapter1-basics_resource_files} ) - install(TARGETS chapter1-basics RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt index c3cd23ea6f..8441aa9fb3 100644 --- a/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/tutorials/extending-qml/chapter2-methods") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(chapter2-methods PUBLIC Qt::Quick ) + # Resources: set(chapter2-methods_resource_files "app.qml" @@ -39,7 +40,6 @@ qt6_add_resources(chapter2-methods "chapter2-methods" ${chapter2-methods_resource_files} ) - install(TARGETS chapter2-methods RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt index 0b00081c93..621b7016a7 100644 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/tutorials/extending-qml/chapter3-bindings") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(chapter3-bindings PUBLIC Qt::Quick ) + # Resources: set(chapter3-bindings_resource_files "app.qml" @@ -39,7 +40,6 @@ qt6_add_resources(chapter3-bindings "chapter3-bindings" ${chapter3-bindings_resource_files} ) - install(TARGETS chapter3-bindings RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt index cd7d2d679a..24b5797da6 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -28,6 +28,7 @@ target_link_libraries(chapter4-customPropertyTypes PUBLIC Qt::Quick ) + # Resources: set(chapter4-customPropertyTypes_resource_files "app.qml" @@ -40,7 +41,6 @@ qt6_add_resources(chapter4-customPropertyTypes "chapter4-customPropertyTypes" ${chapter4-customPropertyTypes_resource_files} ) - install(TARGETS chapter4-customPropertyTypes RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt index 22fbf5ec98..3fa1a5b6e0 100644 --- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/tutorials/extending-qml/chapter5-listproperties") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -28,6 +28,7 @@ target_link_libraries(chapter5-listproperties PUBLIC Qt::Quick ) + # Resources: set(chapter5-listproperties_resource_files "app.qml" @@ -40,7 +41,6 @@ qt6_add_resources(chapter5-listproperties "chapter5-listproperties" ${chapter5-listproperties_resource_files} ) - install(TARGETS chapter5-listproperties RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/.prev_CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter6-plugins/.prev_CMakeLists.txt index eea602f6f8..ef3b9791f9 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/.prev_CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/.prev_CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/tutorials/extending-qml/chapter6-plugins") find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) @@ -22,6 +22,7 @@ target_link_libraries(chapter6-plugins PUBLIC Qt::Quick ) + # Resources: set(app_resource_files "app.qml" @@ -34,7 +35,6 @@ qt6_add_resources(chapter6-plugins "app" ${app_resource_files} ) - install(TARGETS chapter6-plugins RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt index b83e160c82..f8b1a2de4c 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/tutorials/extending-qml/chapter6-plugins") find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) @@ -22,6 +22,7 @@ target_link_libraries(chapter6-plugins PUBLIC Qt::Quick ) + # Resources: set(app_resource_files "app.qml" @@ -34,7 +35,6 @@ qt6_add_resources(chapter6-plugins "app" ${app_resource_files} ) - install(TARGETS chapter6-plugins RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt index 938340eb87..41abb2891b 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/tutorials/extending-qml/chapter6-plugins/Charts") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/qml/xmlhttprequest/CMakeLists.txt b/examples/qml/xmlhttprequest/CMakeLists.txt index 52cf5c6f16..b8e691c43b 100644 --- a/examples/qml/xmlhttprequest/CMakeLists.txt +++ b/examples/qml/xmlhttprequest/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qml/xmlhttprequest") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(xmlhttprequest PUBLIC Qt::Quick ) + # Resources: set(xmlhttprequest_resource_files "Get.qml" @@ -97,7 +98,6 @@ qt6_add_resources(xmlhttprequest "quick_shared" ${quick_shared_resource_files} ) - install(TARGETS xmlhttprequest RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qmltest/qmltest/.prev_CMakeLists.txt b/examples/qmltest/qmltest/.prev_CMakeLists.txt index 1000bba18c..a24e6ef85e 100644 --- a/examples/qmltest/qmltest/.prev_CMakeLists.txt +++ b/examples/qmltest/qmltest/.prev_CMakeLists.txt @@ -21,6 +21,12 @@ target_link_libraries(tst_qmltestexample PUBLIC Qt::Core Qt::Gui ) +if(QT_BUILDING_QT) + target_link_libraries(tst_qmltestexample PUBLIC + Qt::Qml + Qt::QuickTest + ) +endif() install(TARGETS tst_qmltestexample RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qmltest/qmltest/CMakeLists.txt b/examples/qmltest/qmltest/CMakeLists.txt index 3fa8eed58d..2c99b73998 100644 --- a/examples/qmltest/qmltest/CMakeLists.txt +++ b/examples/qmltest/qmltest/CMakeLists.txt @@ -28,6 +28,16 @@ target_link_libraries(tst_qmltestexample PUBLIC # special case end ) +# special case begin +# This ling get added, but does not make sense +#if(QT_BUILDING_QT) +# target_link_libraries(tst_qmltestexample PUBLIC +# Qt::Qml +# Qt::QuickTest +# ) +#endif() +# special case end + install(TARGETS tst_qmltestexample RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/animation/CMakeLists.txt b/examples/quick/animation/CMakeLists.txt index f734d25e65..ee08fb47b9 100644 --- a/examples/quick/animation/CMakeLists.txt +++ b/examples/quick/animation/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/animation") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(animation PUBLIC Qt::Quick ) + # Resources: set_source_files_properties("../shared/Button.qml" PROPERTIES QT_RESOURCE_ALIAS "Button.qml" @@ -127,7 +128,6 @@ qt6_add_resources(animation "animation" ${animation_resource_files} ) - install(TARGETS animation RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/canvas/CMakeLists.txt b/examples/quick/canvas/CMakeLists.txt index 49d9e11f6a..79a0479b6c 100644 --- a/examples/quick/canvas/CMakeLists.txt +++ b/examples/quick/canvas/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/canvas") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(canvas PUBLIC Qt::Quick ) + # Resources: set(canvas_resource_files "bezierCurve/bezierCurve.qml" @@ -119,7 +120,6 @@ qt6_add_resources(canvas "shared" ${shared_resource_files} ) - install(TARGETS canvas RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/customitems/dialcontrol/CMakeLists.txt b/examples/quick/customitems/dialcontrol/CMakeLists.txt index 3c14b7c68b..0ffee20a9b 100644 --- a/examples/quick/customitems/dialcontrol/CMakeLists.txt +++ b/examples/quick/customitems/dialcontrol/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/customitems/dialcontrol") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(dialcontrol PUBLIC Qt::Quick ) + # Resources: set(dialcontrol_resource_files "content/Dial.qml" @@ -45,7 +46,6 @@ qt6_add_resources(dialcontrol "dialcontrol" ${dialcontrol_resource_files} ) - install(TARGETS dialcontrol RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/customitems/maskedmousearea/CMakeLists.txt b/examples/quick/customitems/maskedmousearea/CMakeLists.txt index dfff154d33..6d3bd6983b 100644 --- a/examples/quick/customitems/maskedmousearea/CMakeLists.txt +++ b/examples/quick/customitems/maskedmousearea/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/customitems/maskedmousearea") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(maskedmousearea PUBLIC Qt::Quick ) + # Resources: set(maskedmousearea_resource_files "images/cloud_1.png" @@ -42,7 +43,6 @@ qt6_add_resources(maskedmousearea "maskedmousearea" ${maskedmousearea_resource_files} ) - install(TARGETS maskedmousearea RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/customitems/painteditem/CMakeLists.txt b/examples/quick/customitems/painteditem/CMakeLists.txt index accf857d20..b036943621 100644 --- a/examples/quick/customitems/painteditem/CMakeLists.txt +++ b/examples/quick/customitems/painteditem/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/customitems/painteditem/TextBalloonPlugin") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -34,6 +34,7 @@ target_link_libraries(qmltextballoonplugin PUBLIC Qt::Quick ) + # Resources: set(painteditem_resource_files "textballoon.h" @@ -47,7 +48,6 @@ qt6_add_resources(qmltextballoonplugin "painteditem" ${painteditem_resource_files} ) - install(TARGETS qmltextballoonplugin RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/delegatechooser/CMakeLists.txt b/examples/quick/delegatechooser/CMakeLists.txt index 1fecd44940..2abb900e4c 100644 --- a/examples/quick/delegatechooser/CMakeLists.txt +++ b/examples/quick/delegatechooser/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/delegatechooser") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(delegatechooser PUBLIC Qt::Quick ) + # Resources: set(qml_resource_files "delegatechooser.qml" @@ -109,7 +110,6 @@ qt6_add_resources(delegatechooser "shared" ${shared_resource_files} ) - install(TARGETS delegatechooser RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/draganddrop/CMakeLists.txt b/examples/quick/draganddrop/CMakeLists.txt index e48f3504a0..51f8bb6f1c 100644 --- a/examples/quick/draganddrop/CMakeLists.txt +++ b/examples/quick/draganddrop/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/draganddrop") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(draganddrop PUBLIC Qt::Quick ) + # Resources: set(draganddrop_resource_files "draganddrop.qml" @@ -113,7 +114,6 @@ qt6_add_resources(draganddrop "shared" ${shared_resource_files} ) - install(TARGETS draganddrop RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/embeddedinwidgets/CMakeLists.txt b/examples/quick/embeddedinwidgets/CMakeLists.txt index 021f940c80..3064ce9105 100644 --- a/examples/quick/embeddedinwidgets/CMakeLists.txt +++ b/examples/quick/embeddedinwidgets/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/embeddedinwidgets") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(embeddedinwidgets PUBLIC Qt::Widgets ) + # Resources: set(embeddedinwidgets_resource_files "TextBox.qml" @@ -39,7 +40,6 @@ qt6_add_resources(embeddedinwidgets "embeddedinwidgets" ${embeddedinwidgets_resource_files} ) - install(TARGETS embeddedinwidgets RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/externaldraganddrop/CMakeLists.txt b/examples/quick/externaldraganddrop/CMakeLists.txt index bdd340e83c..562de203e5 100644 --- a/examples/quick/externaldraganddrop/CMakeLists.txt +++ b/examples/quick/externaldraganddrop/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/externaldraganddrop") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(externaldraganddrop PUBLIC Qt::Quick ) + # Resources: set(externaldraganddrop_resource_files "DragAndDropTextItem.qml" @@ -110,7 +111,6 @@ qt6_add_resources(externaldraganddrop "shared" ${shared_resource_files} ) - install(TARGETS externaldraganddrop RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt index 2f4f5ad00d..03068241ec 100644 --- a/examples/quick/imageelements/CMakeLists.txt +++ b/examples/quick/imageelements/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(imageelements PUBLIC Qt::Quick ) + # Resources: set(imageelements_resource_files "animatedimage.qml" @@ -132,7 +133,6 @@ qt6_add_resources(imageelements "shared" ${shared_resource_files} ) - install(TARGETS imageelements RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/imageprovider/CMakeLists.txt b/examples/quick/imageprovider/CMakeLists.txt index 386d23ede2..69008ef00a 100644 --- a/examples/quick/imageprovider/CMakeLists.txt +++ b/examples/quick/imageprovider/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/imageprovider/ImageProviderCore") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/quick/imageresponseprovider/CMakeLists.txt b/examples/quick/imageresponseprovider/CMakeLists.txt index 70ef249b99..4b7a33c1b1 100644 --- a/examples/quick/imageresponseprovider/CMakeLists.txt +++ b/examples/quick/imageresponseprovider/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/imageresponseprovider/ImageResponseProviderCore") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/quick/keyinteraction/CMakeLists.txt b/examples/quick/keyinteraction/CMakeLists.txt index 5e7d7b5549..50505dd2da 100644 --- a/examples/quick/keyinteraction/CMakeLists.txt +++ b/examples/quick/keyinteraction/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/keyinteraction") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(keyinteraction PUBLIC Qt::Quick ) + # Resources: set(keyinteraction_resource_files "focus/Core/ContextMenu.qml" @@ -46,7 +47,6 @@ qt6_add_resources(keyinteraction "keyinteraction" ${keyinteraction_resource_files} ) - install(TARGETS keyinteraction RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/layouts/CMakeLists.txt b/examples/quick/layouts/CMakeLists.txt index 8835395fac..b83e3256a0 100644 --- a/examples/quick/layouts/CMakeLists.txt +++ b/examples/quick/layouts/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/layouts") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(layouts PUBLIC Qt::Quick ) + # Resources: set(layouts_resource_files "layouts.qml" @@ -38,7 +39,6 @@ qt6_add_resources(layouts "layouts" ${layouts_resource_files} ) - install(TARGETS layouts RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/localstorage/localstorage/CMakeLists.txt b/examples/quick/localstorage/localstorage/CMakeLists.txt index b449f3450a..60d2e82fbf 100644 --- a/examples/quick/localstorage/localstorage/CMakeLists.txt +++ b/examples/quick/localstorage/localstorage/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/localstorage/localstorage") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(localstorage PUBLIC Qt::Quick ) + # Resources: set(localstorage_resource_files "Database.js" @@ -114,7 +115,6 @@ qt6_add_resources(localstorage "shared" ${shared_resource_files} ) - install(TARGETS localstorage RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/models/abstractitemmodel/CMakeLists.txt b/examples/quick/models/abstractitemmodel/CMakeLists.txt index 89afe06cff..242a90f7c5 100644 --- a/examples/quick/models/abstractitemmodel/CMakeLists.txt +++ b/examples/quick/models/abstractitemmodel/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/models/abstractitemmodel") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(abstractitemmodel PUBLIC Qt::Quick ) + # Resources: set(abstractitemmodel_resource_files "view.qml" @@ -39,7 +40,6 @@ qt6_add_resources(abstractitemmodel "abstractitemmodel" ${abstractitemmodel_resource_files} ) - install(TARGETS abstractitemmodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/models/objectlistmodel/CMakeLists.txt b/examples/quick/models/objectlistmodel/CMakeLists.txt index 742e60c523..1c29dcdcb6 100644 --- a/examples/quick/models/objectlistmodel/CMakeLists.txt +++ b/examples/quick/models/objectlistmodel/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/models/objectlistmodel") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(objectlistmodel PUBLIC Qt::Quick ) + # Resources: set(objectlistmodel_resource_files "view.qml" @@ -39,7 +40,6 @@ qt6_add_resources(objectlistmodel "objectlistmodel" ${objectlistmodel_resource_files} ) - install(TARGETS objectlistmodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/models/stringlistmodel/CMakeLists.txt b/examples/quick/models/stringlistmodel/CMakeLists.txt index f0cd3f7239..3b15a97450 100644 --- a/examples/quick/models/stringlistmodel/CMakeLists.txt +++ b/examples/quick/models/stringlistmodel/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/models/stringlistmodel") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(stringlistmodel PUBLIC Qt::Quick ) + # Resources: set(stringlistmodel_resource_files "view.qml" @@ -38,7 +39,6 @@ qt6_add_resources(stringlistmodel "stringlistmodel" ${stringlistmodel_resource_files} ) - install(TARGETS stringlistmodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/mousearea/CMakeLists.txt b/examples/quick/mousearea/CMakeLists.txt index 7cb9cb9dc3..82a1d2fb35 100644 --- a/examples/quick/mousearea/CMakeLists.txt +++ b/examples/quick/mousearea/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/mousearea") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(mousearea PUBLIC Qt::Quick ) + # Resources: set(mousearea_resource_files "mousearea-wheel-example.qml" @@ -39,7 +40,6 @@ qt6_add_resources(mousearea "mousearea" ${mousearea_resource_files} ) - install(TARGETS mousearea RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/particles/affectors/CMakeLists.txt b/examples/quick/particles/affectors/CMakeLists.txt index 85a4cebdd5..9675a61051 100644 --- a/examples/quick/particles/affectors/CMakeLists.txt +++ b/examples/quick/particles/affectors/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/particles/affectors") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(affectors PUBLIC Qt::Quick ) + # Resources: set(affectors_resource_files "affectors.qml" @@ -255,7 +256,6 @@ qt6_add_resources(affectors "shared" ${shared_resource_files} ) - install(TARGETS affectors RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/particles/customparticle/CMakeLists.txt b/examples/quick/particles/customparticle/CMakeLists.txt index 533b8e1547..d19a5a49b8 100644 --- a/examples/quick/particles/customparticle/CMakeLists.txt +++ b/examples/quick/particles/customparticle/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/particles/customparticle") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(customparticle PUBLIC Qt::Quick ) + # Resources: set(customparticle_resource_files "content/blurparticles.qml" @@ -247,7 +248,6 @@ qt6_add_resources(customparticle "shared" ${shared_resource_files} ) - install(TARGETS customparticle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/particles/emitters/CMakeLists.txt b/examples/quick/particles/emitters/CMakeLists.txt index 6102476837..94e7e5ef18 100644 --- a/examples/quick/particles/emitters/CMakeLists.txt +++ b/examples/quick/particles/emitters/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/particles/emitters") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(emitters PUBLIC Qt::Quick ) + # Resources: set(emitters_resource_files "content/burstandpulse.qml" @@ -251,7 +252,6 @@ qt6_add_resources(emitters "shared" ${shared_resource_files} ) - install(TARGETS emitters RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/particles/imageparticle/CMakeLists.txt b/examples/quick/particles/imageparticle/CMakeLists.txt index 51eea97879..05b307f83d 100644 --- a/examples/quick/particles/imageparticle/CMakeLists.txt +++ b/examples/quick/particles/imageparticle/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/particles/imageparticle") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(imageparticle PUBLIC Qt::Quick ) + # Resources: set(imageparticle_resource_files "content/allatonce.qml" @@ -251,7 +252,6 @@ qt6_add_resources(imageparticle "shared" ${shared_resource_files} ) - install(TARGETS imageparticle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/particles/itemparticle/CMakeLists.txt b/examples/quick/particles/itemparticle/CMakeLists.txt index c0bb8b7ccc..9e09849c30 100644 --- a/examples/quick/particles/itemparticle/CMakeLists.txt +++ b/examples/quick/particles/itemparticle/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/particles/itemparticle") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,17 @@ target_link_libraries(itemparticle PUBLIC Qt::Quick ) + +file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "content/*") +foreach(file IN LISTS resource_glob_0) + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") +endforeach() + +file(GLOB resource_glob_1 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*qml") +foreach(file IN LISTS resource_glob_1) + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") +endforeach() + # Resources: set_source_files_properties("../images/_explo.png" PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png" @@ -233,16 +244,6 @@ qt6_add_resources(itemparticle "shared" FILES ${shared_resource_files} ) - -file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "content/*") -foreach(file IN LISTS resource_glob_0) - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") -endforeach() - -file(GLOB resource_glob_1 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*qml") -foreach(file IN LISTS resource_glob_1) - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") -endforeach() set(qmake_immediate_resource_files ${resource_glob_0} ${resource_glob_1} @@ -255,7 +256,6 @@ qt6_add_resources(itemparticle "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS itemparticle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/particles/system/CMakeLists.txt b/examples/quick/particles/system/CMakeLists.txt index ec94674d58..09513b46f7 100644 --- a/examples/quick/particles/system/CMakeLists.txt +++ b/examples/quick/particles/system/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/particles/system") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(system PUBLIC Qt::Quick ) + # Resources: set(system_resource_files "content/dynamiccomparison.qml" @@ -249,7 +250,6 @@ qt6_add_resources(system "shared" ${shared_resource_files} ) - install(TARGETS system RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/positioners/CMakeLists.txt b/examples/quick/positioners/CMakeLists.txt index 8f128ca5c9..1f8cb8a855 100644 --- a/examples/quick/positioners/CMakeLists.txt +++ b/examples/quick/positioners/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/positioners") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(positioners PUBLIC Qt::Quick ) + # Resources: set(positioners_resource_files "positioners-attachedproperties.qml" @@ -111,7 +112,6 @@ qt6_add_resources(positioners "shared" ${shared_resource_files} ) - install(TARGETS positioners RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/quick-accessibility/CMakeLists.txt b/examples/quick/quick-accessibility/CMakeLists.txt index 0ad266aaf5..965d4fd820 100644 --- a/examples/quick/quick-accessibility/CMakeLists.txt +++ b/examples/quick/quick-accessibility/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/quick-accessibility") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(quick-accessibility PUBLIC Qt::Quick ) + # Resources: set(accessibility_resource_files "accessibility.qml" @@ -41,7 +42,6 @@ qt6_add_resources(quick-accessibility "accessibility" ${accessibility_resource_files} ) - install(TARGETS quick-accessibility RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/quickwidgets/qquickviewcomparison/CMakeLists.txt b/examples/quick/quickwidgets/qquickviewcomparison/CMakeLists.txt index 2cd422b762..c13ede27e0 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/CMakeLists.txt +++ b/examples/quick/quickwidgets/qquickviewcomparison/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/quickwidgets/qquickviewcomparison") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -31,6 +31,7 @@ target_link_libraries(qquickviewcomparison PUBLIC Qt::Widgets ) + # Resources: set(qquickviewcomparison_resource_files "test.qml" @@ -43,7 +44,6 @@ qt6_add_resources(qquickviewcomparison "qquickviewcomparison" ${qquickviewcomparison_resource_files} ) - install(TARGETS qquickviewcomparison RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt index 87bed430fc..7c9b599438 100644 --- a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt +++ b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/quickwidgets/quickwidget") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -29,6 +29,7 @@ target_link_libraries(quickwidget PUBLIC Qt::Widgets ) + # Resources: set(quickwidget_resource_files "customgl.qml" @@ -43,7 +44,6 @@ qt6_add_resources(quickwidget "quickwidget" ${quickwidget_resource_files} ) - install(TARGETS quickwidget RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/rendercontrol/CMakeLists.txt b/examples/quick/rendercontrol/CMakeLists.txt index 4587e128b9..8f1067a7b5 100644 --- a/examples/quick/rendercontrol/CMakeLists.txt +++ b/examples/quick/rendercontrol/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/rendercontrol") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -29,6 +29,7 @@ target_link_libraries(rendercontrol PUBLIC Qt::Quick ) + # Resources: set(rendercontrol_resource_files "demo.qml" @@ -41,7 +42,6 @@ qt6_add_resources(rendercontrol "rendercontrol" ${rendercontrol_resource_files} ) - install(TARGETS rendercontrol RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/righttoleft/CMakeLists.txt b/examples/quick/righttoleft/CMakeLists.txt index 93b94212c9..e077f2e977 100644 --- a/examples/quick/righttoleft/CMakeLists.txt +++ b/examples/quick/righttoleft/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/righttoleft") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(righttoleft PUBLIC Qt::Quick ) + # Resources: set(righttoleft_resource_files "layoutdirection/layoutdirection.qml" @@ -112,7 +113,6 @@ qt6_add_resources(righttoleft "shared" ${shared_resource_files} ) - install(TARGETS righttoleft RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/customgeometry/CMakeLists.txt b/examples/quick/scenegraph/customgeometry/CMakeLists.txt index 079476a205..a206d75bd4 100644 --- a/examples/quick/scenegraph/customgeometry/CMakeLists.txt +++ b/examples/quick/scenegraph/customgeometry/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/customgeometry") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -25,6 +25,7 @@ target_link_libraries(customgeometry PUBLIC Qt::Quick ) + # Resources: set(customgeometry_resource_files "main.qml" @@ -37,7 +38,6 @@ qt6_add_resources(customgeometry "customgeometry" ${customgeometry_resource_files} ) - install(TARGETS customgeometry RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt b/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt index 098b5e70da..b34d8026b6 100644 --- a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt +++ b/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/d3d11underqml") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -29,6 +29,7 @@ target_link_libraries(d3d11underqml PUBLIC d3dcompiler ) + # Resources: set(d3d11underqml_resource_files "main.qml" @@ -43,7 +44,6 @@ qt6_add_resources(d3d11underqml "d3d11underqml" ${d3d11underqml_resource_files} ) - install(TARGETS d3d11underqml RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/graph/CMakeLists.txt b/examples/quick/scenegraph/graph/CMakeLists.txt index 7ac1d3ad42..da9078df03 100644 --- a/examples/quick/scenegraph/graph/CMakeLists.txt +++ b/examples/quick/scenegraph/graph/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/graph") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -28,6 +28,7 @@ target_link_libraries(graph PUBLIC Qt::Quick ) + # Resources: set(graph_resource_files "main.qml" @@ -44,7 +45,6 @@ qt6_add_resources(graph "graph" ${graph_resource_files} ) - install(TARGETS graph RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt index 9702987176..6f61cdd727 100644 --- a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/metalunderqml") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -21,14 +21,15 @@ add_qt_gui_executable(metalunderqml metalsquircle.h metalsquircle.mm ) target_link_libraries(metalunderqml PUBLIC - ${FWAppKit} - ${FWMetal} + "-framework AppKit" + "-framework Metal" Qt::Core Qt::Gui Qt::Qml Qt::Quick ) + # Resources: set(metalunderqml_resource_files "main.qml" @@ -43,7 +44,6 @@ qt6_add_resources(metalunderqml "metalunderqml" ${metalunderqml_resource_files} ) - install(TARGETS metalunderqml RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/openglunderqml/CMakeLists.txt b/examples/quick/scenegraph/openglunderqml/CMakeLists.txt index 238c8c707f..1b83e8c32a 100644 --- a/examples/quick/scenegraph/openglunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/openglunderqml/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/openglunderqml") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(openglunderqml PUBLIC Qt::Quick ) + # Resources: set(openglunderqml_resource_files "main.qml" @@ -39,7 +40,6 @@ qt6_add_resources(openglunderqml "openglunderqml" ${openglunderqml_resource_files} ) - install(TARGETS openglunderqml RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/rendernode/CMakeLists.txt b/examples/quick/scenegraph/rendernode/CMakeLists.txt index 9f0ad7da52..05ed4dab42 100644 --- a/examples/quick/scenegraph/rendernode/CMakeLists.txt +++ b/examples/quick/scenegraph/rendernode/CMakeLists.txt @@ -29,6 +29,7 @@ target_link_libraries(rendernode PUBLIC Qt::Quick ) + # Resources: set(rendernode_resource_files "main.qml" @@ -45,6 +46,15 @@ qt6_add_resources(rendernode "rendernode" ${rendernode_resource_files} ) +if(QT_FEATURE_d3d12) + target_sources(rendernode PUBLIC + d3d12renderer.cpp d3d12renderer.h + ) + + target_link_libraries(rendernode PUBLIC + d3d12 + ) +endif() if(QT_FEATURE_d3d12) target_sources(rendernode PUBLIC diff --git a/examples/quick/scenegraph/sgengine/CMakeLists.txt b/examples/quick/scenegraph/sgengine/CMakeLists.txt index 42f342dc20..7580796800 100644 --- a/examples/quick/scenegraph/sgengine/CMakeLists.txt +++ b/examples/quick/scenegraph/sgengine/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/sgengine") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -25,6 +25,7 @@ target_link_libraries(sgengine PUBLIC Qt::Quick ) + # Resources: set(sgengine_resource_files "face-smile.png" @@ -108,7 +109,6 @@ qt6_add_resources(sgengine "shared" ${shared_resource_files} ) - install(TARGETS sgengine RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/simplematerial/CMakeLists.txt b/examples/quick/scenegraph/simplematerial/CMakeLists.txt index 21c2609cfe..9fb02cb53b 100644 --- a/examples/quick/scenegraph/simplematerial/CMakeLists.txt +++ b/examples/quick/scenegraph/simplematerial/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/simplematerial") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -24,6 +24,7 @@ target_link_libraries(simplematerial PUBLIC Qt::Quick ) + # Resources: set(simplematerial_resource_files "main.qml" @@ -36,7 +37,6 @@ qt6_add_resources(simplematerial "simplematerial" ${simplematerial_resource_files} ) - install(TARGETS simplematerial RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/textureinsgnode/CMakeLists.txt b/examples/quick/scenegraph/textureinsgnode/CMakeLists.txt index c92ea4b8b7..1117ef22a9 100644 --- a/examples/quick/scenegraph/textureinsgnode/CMakeLists.txt +++ b/examples/quick/scenegraph/textureinsgnode/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/textureinsgnode") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -24,6 +24,7 @@ add_qt_gui_executable(textureinsgnode target_include_directories(textureinsgnode PUBLIC ../shared ) + target_link_libraries(textureinsgnode PUBLIC Qt::Core Qt::Gui @@ -31,6 +32,7 @@ target_link_libraries(textureinsgnode PUBLIC Qt::Quick ) + # Resources: set(textureinsgnode_resource_files "main.qml" @@ -43,7 +45,6 @@ qt6_add_resources(textureinsgnode "textureinsgnode" ${textureinsgnode_resource_files} ) - install(TARGETS textureinsgnode RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/textureinthread/CMakeLists.txt b/examples/quick/scenegraph/textureinthread/CMakeLists.txt index 12579b3456..b409f230af 100644 --- a/examples/quick/scenegraph/textureinthread/CMakeLists.txt +++ b/examples/quick/scenegraph/textureinthread/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/textureinthread") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -23,16 +23,19 @@ add_qt_gui_executable(textureinthread target_include_directories(textureinthread PUBLIC ../shared ) + target_link_libraries(textureinthread PRIVATE Qt::CorePrivate Qt::GuiPrivate ) + target_link_libraries(textureinthread PUBLIC Qt::Core Qt::Gui Qt::Quick ) + # Resources: set(textureinthread_resource_files "error.qml" @@ -46,7 +49,6 @@ qt6_add_resources(textureinthread "textureinthread" ${textureinthread_resource_files} ) - install(TARGETS textureinthread RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/threadedanimation/CMakeLists.txt b/examples/quick/scenegraph/threadedanimation/CMakeLists.txt index eae7e6a1b3..be45e855da 100644 --- a/examples/quick/scenegraph/threadedanimation/CMakeLists.txt +++ b/examples/quick/scenegraph/threadedanimation/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/threadedanimation") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(threadedanimation PUBLIC Qt::Quick ) + # Resources: set(threadedanimation_resource_files "main.qml" @@ -40,7 +41,6 @@ qt6_add_resources(threadedanimation "threadedanimation" ${threadedanimation_resource_files} ) - install(TARGETS threadedanimation RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt index 2969997b08..adcc3b8978 100644 --- a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt +++ b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/twotextureproviders") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(twotextureproviders PUBLIC Qt::Quick ) + # Resources: set(twotextureproviders_resource_files "main.qml" @@ -39,7 +40,6 @@ qt6_add_resources(twotextureproviders "twotextureproviders" ${twotextureproviders_resource_files} ) - install(TARGETS twotextureproviders RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/shadereffects/CMakeLists.txt b/examples/quick/shadereffects/CMakeLists.txt index 840daccf91..972ef27dc8 100644 --- a/examples/quick/shadereffects/CMakeLists.txt +++ b/examples/quick/shadereffects/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/shadereffects") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(shadereffects PUBLIC Qt::Quick ) + # Resources: set(shadereffects_resource_files "content/Slider.qml" @@ -59,7 +60,6 @@ qt6_add_resources(shadereffects "shadereffects" ${shadereffects_resource_files} ) - install(TARGETS shadereffects RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/shapes/CMakeLists.txt b/examples/quick/shapes/CMakeLists.txt index 69be2ee4a3..6357140357 100644 --- a/examples/quick/shapes/CMakeLists.txt +++ b/examples/quick/shapes/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/shapes") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(shapes PUBLIC Qt::Quick ) + # Resources: set_source_files_properties("../shared/LauncherList.qml" PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" @@ -149,7 +150,6 @@ qt6_add_resources(shapes "shapes" ${shapes_resource_files} ) - install(TARGETS shapes RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/tableview/gameoflife/CMakeLists.txt b/examples/quick/tableview/gameoflife/CMakeLists.txt index 1fb4e744c4..af6c2b404b 100644 --- a/examples/quick/tableview/gameoflife/CMakeLists.txt +++ b/examples/quick/tableview/gameoflife/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/tableview/gameoflife") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(gameoflife PUBLIC Qt::Quick ) + # Resources: set(qmake_immediate_resource_files "gosperglidergun.cells" @@ -40,7 +41,6 @@ qt6_add_resources(gameoflife "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS gameoflife RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/tableview/pixelator/CMakeLists.txt b/examples/quick/tableview/pixelator/CMakeLists.txt index 738ee846ce..ee852a3b61 100644 --- a/examples/quick/tableview/pixelator/CMakeLists.txt +++ b/examples/quick/tableview/pixelator/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/tableview/pixelator") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(pixelator PUBLIC Qt::Quick ) + # Resources: set(qmake_immediate_resource_files "main.qml" @@ -40,7 +41,6 @@ qt6_add_resources(pixelator "qmake_immediate" ${qmake_immediate_resource_files} ) - install(TARGETS pixelator RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/text/CMakeLists.txt b/examples/quick/text/CMakeLists.txt index 8f17197b2b..7b6b9c2101 100644 --- a/examples/quick/text/CMakeLists.txt +++ b/examples/quick/text/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/text") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(text PUBLIC Qt::Quick ) + # Resources: set(text_resource_files "fonts/availableFonts.qml" @@ -128,7 +129,6 @@ qt6_add_resources(text "shared" ${shared_resource_files} ) - install(TARGETS text RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/textureprovider/CMakeLists.txt b/examples/quick/textureprovider/CMakeLists.txt index ac65ce93a8..d43f6a1898 100644 --- a/examples/quick/textureprovider/CMakeLists.txt +++ b/examples/quick/textureprovider/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/textureprovider") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(textureprovider PUBLIC Qt::Quick ) + # Resources: set(textureprovider_resource_files "Label.qml" @@ -42,7 +43,6 @@ qt6_add_resources(textureprovider "textureprovider" ${textureprovider_resource_files} ) - install(TARGETS textureprovider RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/threading/CMakeLists.txt b/examples/quick/threading/CMakeLists.txt index 06843792ae..7a024a37eb 100644 --- a/examples/quick/threading/CMakeLists.txt +++ b/examples/quick/threading/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/threading") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(threading PUBLIC Qt::Quick ) + # Resources: set(threading_resource_files "threadedlistmodel/dataloader.mjs" @@ -114,7 +115,6 @@ qt6_add_resources(threading "shared" ${shared_resource_files} ) - install(TARGETS threading RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/touchinteraction/CMakeLists.txt b/examples/quick/touchinteraction/CMakeLists.txt index a063ee980b..cbaf7cc2f3 100644 --- a/examples/quick/touchinteraction/CMakeLists.txt +++ b/examples/quick/touchinteraction/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/touchinteraction") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(touchinteraction PUBLIC Qt::Quick ) + # Resources: set(touchinteraction_resource_files "flickable/basic-flickable.qml" @@ -131,7 +132,6 @@ qt6_add_resources(touchinteraction "shared" ${shared_resource_files} ) - install(TARGETS touchinteraction RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/views/CMakeLists.txt b/examples/quick/views/CMakeLists.txt index 4450c45b6a..a53c977ab9 100644 --- a/examples/quick/views/CMakeLists.txt +++ b/examples/quick/views/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/views") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(views PUBLIC Qt::Quick ) + # Resources: set(views_resource_files "delegatemodel/dragselection.qml" @@ -154,7 +155,6 @@ qt6_add_resources(views "shared" ${shared_resource_files} ) - install(TARGETS views RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/window/CMakeLists.txt b/examples/quick/window/CMakeLists.txt index b162f43789..80857c72d2 100644 --- a/examples/quick/window/CMakeLists.txt +++ b/examples/quick/window/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/window") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(window PUBLIC Qt::Quick ) + # Resources: set(window_resource_files "AllScreens.qml" @@ -112,7 +113,6 @@ qt6_add_resources(window "shared" ${shared_resource_files} ) - install(TARGETS window RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" |