diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-08-23 18:26:06 +1000 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-08-25 10:44:41 +1000 |
| commit | 5cdec4e0c7b0d292c4d099189dd27c19eb314f2d (patch) | |
| tree | c80c25cb9b5c40fbb39fe4aea88636085987108f /examples/quick/scenegraph/vulkanunderqml | |
| parent | 58127aa35945dc76bd71b69b25d141025267f4c8 (diff) | |
Update quick examples to new QML CMake API
This is a pre-requisite to being able to make
qt6_qml_type_registration() an internal rather than public command.
Not all examples have been updated, only those that were using the
qt6_qml_type_registration() command.
Task-number: QTBUG-95093
Change-Id: I3f1814a29af608461daa90477eca0aa2304eb9d1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a86fd709dd4d315cfe4fea77ea0bc730131fe840)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/quick/scenegraph/vulkanunderqml')
| -rw-r--r-- | examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt index 24cf8dd6c3..6921427d1b 100644 --- a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt @@ -27,6 +27,9 @@ qt_add_executable(vulkanunderqml set_target_properties(vulkanunderqml PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE + + # Prevent name clash with build subdirectory on case-insensitive file systems + OUTPUT_NAME vulkanunderqmlapp ) target_link_libraries(vulkanunderqml PUBLIC Qt::Core @@ -35,19 +38,16 @@ target_link_libraries(vulkanunderqml PUBLIC Qt::Quick ) - -# Resources: -set(vulkanunderqml_resource_files - "main.qml" - "squircle.frag.spv" - "squircle.vert.spv" -) - -qt6_add_resources(vulkanunderqml "vulkanunderqml" - PREFIX - "/scenegraph/vulkanunderqml" - FILES - ${vulkanunderqml_resource_files} +qt_add_qml_module(vulkanunderqml + URI VulkanUnderQML + VERSION 1.0 + QML_FILES + main.qml + RESOURCES + squircle.frag.spv + squircle.vert.spv + RESOURCE_PREFIX /scenegraph/vulkanunderqml + NO_RESOURCE_TARGET_PATH ) install(TARGETS vulkanunderqml @@ -55,10 +55,3 @@ install(TARGETS vulkanunderqml BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) - -set_target_properties(vulkanunderqml PROPERTIES - QT_QML_MODULE_VERSION 1.0 - QT_QML_MODULE_URI VulkanUnderQML -) - -qt6_qml_type_registration(vulkanunderqml) |