Update qml examples for improved target path handling

Some examples were still using the old "add as ordinary resources"
approach for QML modules, others needed adjustment to the subdirectory
structure to better reflect the URI structure of the QML modules
involved.

Task-number: QTBUG-95144
Pick-to: 6.2
Change-Id: Ie3399410cf6df491eb1e7b4a589ca26c577d82a0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

11 files changed, 55 insertions, 198 deletions

diff --git a/examples/qml/referenceexamples/adding/CMakeLists.txt b/examples/qml/referenceexamples/adding/CMakeLists.txt
index b90a7f6c36..b86d90a4c3 100644
--- a/examples/qml/referenceexamples/adding/CMakeLists.txt
+++ b/examples/qml/referenceexamples/adding/CMakeLists.txt
@@ -31,17 +31,11 @@ target_link_libraries(adding PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(adding_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(adding "adding"
-    PREFIX
-        "/"
-    FILES
-        ${adding_resource_files}
+qt_add_qml_module(adding
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS adding
@@ -49,10 +43,3 @@ install(TARGETS adding
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(adding PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(adding)
diff --git a/examples/qml/referenceexamples/attached/CMakeLists.txt b/examples/qml/referenceexamples/attached/CMakeLists.txt
index 684db88a95..4d49cc5663 100644
--- a/examples/qml/referenceexamples/attached/CMakeLists.txt
+++ b/examples/qml/referenceexamples/attached/CMakeLists.txt
@@ -34,17 +34,11 @@ target_link_libraries(attached PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(attached_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(attached "attached"
-    PREFIX
-        "/"
-    FILES
-        ${attached_resource_files}
+qt_add_qml_module(attached
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS attached
@@ -52,10 +46,3 @@ install(TARGETS attached
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(attached PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(attached)
diff --git a/examples/qml/referenceexamples/binding/CMakeLists.txt b/examples/qml/referenceexamples/binding/CMakeLists.txt
index fc733922bb..2a2d6575c0 100644
--- a/examples/qml/referenceexamples/binding/CMakeLists.txt
+++ b/examples/qml/referenceexamples/binding/CMakeLists.txt
@@ -35,17 +35,11 @@ target_link_libraries(binding PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(binding_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(binding "binding"
-    PREFIX
-        "/"
-    FILES
-        ${binding_resource_files}
+qt_add_qml_module(binding
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS binding
@@ -53,10 +47,3 @@ install(TARGETS binding
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(binding PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(binding)
diff --git a/examples/qml/referenceexamples/coercion/CMakeLists.txt b/examples/qml/referenceexamples/coercion/CMakeLists.txt
index cd93fa4883..b9613de116 100644
--- a/examples/qml/referenceexamples/coercion/CMakeLists.txt
+++ b/examples/qml/referenceexamples/coercion/CMakeLists.txt
@@ -32,17 +32,11 @@ target_link_libraries(coercion PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(coercion_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(coercion "coercion"
-    PREFIX
-        "/"
-    FILES
-        ${coercion_resource_files}
+qt_add_qml_module(coercion
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS coercion
@@ -50,10 +44,3 @@ install(TARGETS coercion
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(coercion PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(coercion)
diff --git a/examples/qml/referenceexamples/default/CMakeLists.txt b/examples/qml/referenceexamples/default/CMakeLists.txt
index 429fcb86ad..419b14d464 100644
--- a/examples/qml/referenceexamples/default/CMakeLists.txt
+++ b/examples/qml/referenceexamples/default/CMakeLists.txt
@@ -32,17 +32,11 @@ target_link_libraries(default PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(default_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(default "default"
-    PREFIX
-        "/"
-    FILES
-        ${default_resource_files}
+qt_add_qml_module(default
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS default
@@ -50,10 +44,3 @@ install(TARGETS default
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(default PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(default)
diff --git a/examples/qml/referenceexamples/extended/CMakeLists.txt b/examples/qml/referenceexamples/extended/CMakeLists.txt
index 87c750bea1..ea659e5f71 100644
--- a/examples/qml/referenceexamples/extended/CMakeLists.txt
+++ b/examples/qml/referenceexamples/extended/CMakeLists.txt
@@ -35,17 +35,11 @@ target_link_libraries(extended PUBLIC
     Qt::Widgets
 )
 
-
-# Resources:
-set(extended_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(extended "extended"
-    PREFIX
-        "/"
-    FILES
-        ${extended_resource_files}
+qt_add_qml_module(extended
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS extended
@@ -53,10 +47,3 @@ install(TARGETS extended
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(extended PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(extended)
diff --git a/examples/qml/referenceexamples/grouped/CMakeLists.txt b/examples/qml/referenceexamples/grouped/CMakeLists.txt
index c46d1beeb8..f7a31d9c1e 100644
--- a/examples/qml/referenceexamples/grouped/CMakeLists.txt
+++ b/examples/qml/referenceexamples/grouped/CMakeLists.txt
@@ -34,17 +34,11 @@ target_link_libraries(grouped PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(grouped_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(grouped "grouped"
-    PREFIX
-        "/"
-    FILES
-        ${grouped_resource_files}
+qt_add_qml_module(grouped
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS grouped
@@ -52,10 +46,3 @@ install(TARGETS grouped
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(grouped PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(grouped)
diff --git a/examples/qml/referenceexamples/methods/CMakeLists.txt b/examples/qml/referenceexamples/methods/CMakeLists.txt
index 0fc043fb8b..304aa3082a 100644
--- a/examples/qml/referenceexamples/methods/CMakeLists.txt
+++ b/examples/qml/referenceexamples/methods/CMakeLists.txt
@@ -32,17 +32,11 @@ target_link_libraries(methods PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(methods_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(methods "methods"
-    PREFIX
-        "/"
-    FILES
-        ${methods_resource_files}
+qt_add_qml_module(methods
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS methods
@@ -50,10 +44,3 @@ install(TARGETS methods
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(methods PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(methods)
diff --git a/examples/qml/referenceexamples/properties/CMakeLists.txt b/examples/qml/referenceexamples/properties/CMakeLists.txt
index 1f36559066..11f70f337f 100644
--- a/examples/qml/referenceexamples/properties/CMakeLists.txt
+++ b/examples/qml/referenceexamples/properties/CMakeLists.txt
@@ -32,17 +32,11 @@ target_link_libraries(properties PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(properties_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(properties "properties"
-    PREFIX
-        "/"
-    FILES
-        ${properties_resource_files}
+qt_add_qml_module(properties
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS properties
@@ -50,10 +44,3 @@ install(TARGETS properties
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(properties PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(properties)
diff --git a/examples/qml/referenceexamples/signal/CMakeLists.txt b/examples/qml/referenceexamples/signal/CMakeLists.txt
index 8e4cac00ce..23e494f7c9 100644
--- a/examples/qml/referenceexamples/signal/CMakeLists.txt
+++ b/examples/qml/referenceexamples/signal/CMakeLists.txt
@@ -34,17 +34,11 @@ target_link_libraries(signal PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(signal_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(signal "signal"
-    PREFIX
-        "/"
-    FILES
-        ${signal_resource_files}
+qt_add_qml_module(signal
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS signal
@@ -52,10 +46,3 @@ install(TARGETS signal
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(signal PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(signal)
diff --git a/examples/qml/referenceexamples/valuesource/CMakeLists.txt b/examples/qml/referenceexamples/valuesource/CMakeLists.txt
index f3653ac4e2..3e997bb8f8 100644
--- a/examples/qml/referenceexamples/valuesource/CMakeLists.txt
+++ b/examples/qml/referenceexamples/valuesource/CMakeLists.txt
@@ -35,17 +35,11 @@ target_link_libraries(valuesource PUBLIC
     Qt::Qml
 )
 
-
-# Resources:
-set(valuesource_resource_files
-    "example.qml"
-)
-
-qt6_add_resources(valuesource "valuesource"
-    PREFIX
-        "/"
-    FILES
-        ${valuesource_resource_files}
+qt_add_qml_module(valuesource
+    URI People
+    VERSION 1.0
+    QML_FILES example.qml
+    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS valuesource
@@ -53,10 +47,3 @@ install(TARGETS valuesource
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-
-set_target_properties(valuesource PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI People
-)
-
-qt6_qml_type_registration(valuesource)