aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-08-31 12:56:59 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-31 21:19:58 +0000
commitb5c2cfcf2cf5252d9de0324af5e855a9b4d489cb (patch)
tree93179b48b480e32c0fe8b5bd47102b51f677f783 /examples/quick
parent145a3c2b77f3139199602e15f04d086a5c91df7e (diff)
Fix shadereffects example to use a QML module
Change-Id: I3787fdfebfa1e376c2891f16f3fcf4f29f0e26d4 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit 255d8a84b35d296febc5c81b193c8ab2984ae1a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/quick')
-rw-r--r--examples/quick/shadereffects/CMakeLists.txt30
1 files changed, 13 insertions, 17 deletions
diff --git a/examples/quick/shadereffects/CMakeLists.txt b/examples/quick/shadereffects/CMakeLists.txt
index 921b065dd7..172146c441 100644
--- a/examples/quick/shadereffects/CMakeLists.txt
+++ b/examples/quick/shadereffects/CMakeLists.txt
@@ -21,14 +21,14 @@ find_package(Qt6 COMPONENTS Quick)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS ShaderTools)
-qt_add_executable(shadereffects
+qt_add_executable(shadereffectsexample
main.cpp
)
-set_target_properties(shadereffects PROPERTIES
+set_target_properties(shadereffectsexample PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_link_libraries(shadereffects PUBLIC
+target_link_libraries(shadereffectsexample PUBLIC
Qt::Core
Qt::Gui
Qt::Qml
@@ -36,21 +36,17 @@ target_link_libraries(shadereffects PUBLIC
)
-# Resources:
-set(shadereffects_resource_files
- "content/face-smile.png"
- "content/qt-logo.png"
- "shadereffects.qml"
+qt_add_qml_module(shadereffectsexample
+ URI shadereffects
+ VERSION 1.0
+ QML_FILES
+ "shadereffects.qml"
+ RESOURCES
+ "content/face-smile.png"
+ "content/qt-logo.png"
)
-qt6_add_resources(shadereffects "shadereffects"
- PREFIX
- "/shadereffects"
- FILES
- ${shadereffects_resource_files}
-)
-
-qt6_add_shaders(shadereffects "shaders"
+qt6_add_shaders(shadereffectsexample "shaders"
BATCHABLE
PRECOMPILE
OPTIMIZED
@@ -65,7 +61,7 @@ qt6_add_shaders(shadereffects "shaders"
"content/shaders/wobble.frag"
)
-install(TARGETS shadereffects
+install(TARGETS shadereffectsexample
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"