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/d3d11underqml | |
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/d3d11underqml')
-rw-r--r-- | examples/quick/scenegraph/d3d11underqml/CMakeLists.txt | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt b/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt index fd9e78a738..74e077a7a5 100644 --- a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt +++ b/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt @@ -37,19 +37,16 @@ target_link_libraries(d3d11underqml PUBLIC d3dcompiler ) - -# Resources: -set(d3d11underqml_resource_files - "main.qml" - "squircle.frag" - "squircle.vert" -) - -qt6_add_resources(d3d11underqml "d3d11underqml" - PREFIX - "/scenegraph/d3d11underqml" - FILES - ${d3d11underqml_resource_files} +qt_add_qml_module(d3d11underqml + URI D3D11UnderQML + VERSION 1.0 + QML_FILES + main.qml + RESOURCES + squircle.frag + squircle.vert + RESOURCE_PREFIX /scenegraph/d3d11underqml + NO_RESOURCE_TARGET_PATH ) install(TARGETS d3d11underqml @@ -57,10 +54,3 @@ install(TARGETS d3d11underqml BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) - -set_target_properties(d3d11underqml PROPERTIES - QT_QML_MODULE_VERSION 1.0 - QT_QML_MODULE_URI D3D11UnderQML -) - -qt6_qml_type_registration(d3d11underqml) |