diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-08-23 16:29:18 +1000 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-08-24 16:08:21 +1000 |
| commit | 9e1d2a0eb15487f8f2acb4d91b281568897fb4e1 (patch) | |
| tree | e055ea022161b4dbbecbb94c2c1fa7c4a83a5ee8 /examples/qml/referenceexamples/coercion | |
| parent | 05bee5bb50378b76b6441895c533f50d99db445e (diff) | |
| download | qtdeclarative-9e1d2a0eb15487f8f2acb4d91b281568897fb4e1.tar.gz | |
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>
Diffstat (limited to 'examples/qml/referenceexamples/coercion')
| -rw-r--r-- | examples/qml/referenceexamples/coercion/CMakeLists.txt | 23 |
1 files changed, 5 insertions, 18 deletions
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) |