From 9e633bbda7608ac0231809e2a6a97ae8f2d849d6 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Fri, 11 Oct 2019 15:47:00 +0200 Subject: Regenerate Examples Change-Id: I2fbfb44bbb6d667e022bffb480feaf74ff0d0a5e Reviewed-by: Alexandru Croitor --- examples/qml/networkaccessmanagerfactory/CMakeLists.txt | 4 ++-- examples/qml/qmlextensionplugins/CMakeLists.txt | 2 +- examples/qml/referenceexamples/adding/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/attached/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/binding/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/coercion/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/default/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/extended/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/grouped/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/methods/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/properties/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/signal/CMakeLists.txt | 4 ++-- examples/qml/referenceexamples/valuesource/CMakeLists.txt | 4 ++-- examples/qml/shell/CMakeLists.txt | 2 +- examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt | 4 ++-- examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt | 4 ++-- examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt | 4 ++-- .../extending-qml/chapter4-customPropertyTypes/CMakeLists.txt | 4 ++-- .../tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt | 4 ++-- .../qml/tutorials/extending-qml/chapter6-plugins/.prev_CMakeLists.txt | 4 ++-- examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt | 4 ++-- .../tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt | 2 +- examples/qml/xmlhttprequest/CMakeLists.txt | 4 ++-- 23 files changed, 43 insertions(+), 43 deletions(-) (limited to 'examples/qml') 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}" -- cgit v1.2.3