diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-09 16:38:35 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-10 21:05:44 +0100 |
| commit | dd1ebfcf8cb4d6104a54354e7d936f8915eb0832 (patch) | |
| tree | b128fc820225c8129c63c10564f7c4678d319b6b /src | |
| parent | 01f3bb703e22ef6722cb2d9a04a57fc9d7f2a2bc (diff) | |
CMake: Regenerate projects using pro2cmake one last time
And fix up some incorrect qmake project files
Change-Id: Ia6d27ac68195635021fe7c4a5f06386a60f3f323
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit c1c4a874e31ba108a3600fbbb0aee7fc0bf34601)
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/tooling/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/particles/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/quick/configure.cmake | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/imports/tooling/CMakeLists.txt b/src/imports/tooling/CMakeLists.txt index a6273a1ee5..c36c8c1474 100644 --- a/src/imports/tooling/CMakeLists.txt +++ b/src/imports/tooling/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from tooling.pro. +# special case skip regeneration -# special case begin set(qml_files "Component.qml" "Enum.qml" @@ -29,5 +29,3 @@ qt6_target_qml_files(quicktooling ${qml_files} ) -# special case end - diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index 2fb7617f87..538e1e5bae 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -64,14 +64,14 @@ qt_internal_add_resource(QuickParticles "particles" ${particles_resource_files} ) set(particles1_resource_files - "shaders_ng/imageparticle_simplepoint.frag.qsb" - "shaders_ng/imageparticle_simplepoint.vert.qsb" - "shaders_ng/imageparticle_coloredpoint.frag.qsb" - "shaders_ng/imageparticle_coloredpoint.vert.qsb" "shaders_ng/imageparticle_colored.frag.qsb" "shaders_ng/imageparticle_colored.vert.qsb" + "shaders_ng/imageparticle_coloredpoint.frag.qsb" + "shaders_ng/imageparticle_coloredpoint.vert.qsb" "shaders_ng/imageparticle_deformed.frag.qsb" "shaders_ng/imageparticle_deformed.vert.qsb" + "shaders_ng/imageparticle_simplepoint.frag.qsb" + "shaders_ng/imageparticle_simplepoint.vert.qsb" "shaders_ng/imageparticle_sprite.frag.qsb" "shaders_ng/imageparticle_sprite.vert.qsb" "shaders_ng/imageparticle_tabled.frag.qsb" diff --git a/src/quick/configure.cmake b/src/quick/configure.cmake index 65fe462b51..b63830671e 100644 --- a/src/quick/configure.cmake +++ b/src/quick/configure.cmake @@ -66,7 +66,7 @@ qt_feature("quick-particles" PRIVATE SECTION "Qt Quick" LABEL "Particle support" PURPOSE "Provides a particle system." - CONDITION TARGET Qt::Gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite AND QT_FEATURE_opengl + CONDITION TARGET Qt::Gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite ) qt_feature("quick-path" PRIVATE SECTION "Qt Quick" |