diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:02:23 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:50:14 +0000 |
commit | f0d23d3ff9da26a71295a6abd356c8d366d17439 (patch) | |
tree | c68f990a0fda40a16c484ffb6403c165c44a73ba /src/particles | |
parent | 5f07a0e1149ed3df41f3ff5ef55f3f8bbad99909 (diff) |
Regenerate qtdeclarative before merge
Change-Id: I5710110679220c4e22bc7f8b540f18a51b735ddf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/particles')
-rw-r--r-- | src/particles/CMakeLists.txt | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index cdba8af06a..83e694d2df 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_module(QuickParticles + INTERNAL_MODULE SOURCES qquickage.cpp qquickage_p.h qquickangledirection.cpp qquickangledirection_p.h @@ -52,26 +53,41 @@ add_qt_module(QuickParticles ) # Resources: -add_qt_resource(QuickParticles "particles" PREFIX "/" FILES - particleresources/fuzzydot.png - particleresources/glowdot.png - particleresources/noise.png - particleresources/star.png) -add_qt_resource(QuickParticles "particles1" PREFIX "/particles" FILES - shaders/customparticle.frag - shaders/customparticle.vert - shaders/customparticle_core.frag - shaders/customparticle_core.vert - shaders/customparticletemplate.vert - shaders/customparticletemplate_core.vert - shaders/imageparticle.frag - shaders/imageparticle.vert - shaders/imageparticle_core.frag - shaders/imageparticle_core.vert) +set(particles_resource_files + "particleresources/fuzzydot.png" + "particleresources/glowdot.png" + "particleresources/noise.png" + "particleresources/star.png" +) + +add_qt_resource(QuickParticles "particles" + PREFIX + "/" + FILES + ${particles_resource_files} +) +set(particles1_resource_files + "shaders/customparticle.frag" + "shaders/customparticle.vert" + "shaders/customparticle_core.frag" + "shaders/customparticle_core.vert" + "shaders/customparticletemplate.vert" + "shaders/customparticletemplate_core.vert" + "shaders/imageparticle.frag" + "shaders/imageparticle.vert" + "shaders/imageparticle_core.frag" + "shaders/imageparticle_core.vert" +) + +add_qt_resource(QuickParticles "particles1" + PREFIX + "/particles" + FILES + ${particles1_resource_files} +) #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>: -# CONFIG = "internal_module" # MODULE = "quickparticles" # _LOADED = "qt_module" |