aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2017-03-09 14:50:19 +0100
committerPaul Olav Tvete <paul.tvete@qt.io>2017-03-13 10:54:54 +0000
commit9180241819a9ea5e517977efc5bb031521a56cc6 (patch)
tree7c0221bd7466e631d4bc8a8c1f7b4cc1ef42d5df /src
parent920e0ddaf987f160cd70deb29d14769092929403 (diff)
Add features.quick-particles
Change-Id: I78b30d254ed64acadcb2acc278ad1dfde55216ac Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/imports.pro2
-rw-r--r--src/quick/configure.json8
-rw-r--r--src/src.pro2
3 files changed, 10 insertions, 2 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 0ba949f070..d16ac05669 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -20,7 +20,7 @@ qtHaveModule(quick) {
sharedimage \
testlib
- qtConfig(quick-shadereffect):qtConfig(quick-sprite):qtConfig(opengl(es1|es2)?): \
+ qtConfig(quick-particles): \
SUBDIRS += particles
}
diff --git a/src/quick/configure.json b/src/quick/configure.json
index 4ed11e8318..eabc8c4824 100644
--- a/src/quick/configure.json
+++ b/src/quick/configure.json
@@ -97,6 +97,14 @@
"privateFeature"
]
},
+ "quick-particles": {
+ "label": "Particle support",
+ "purpose": "Provides a particle system for Qt Quick",
+ "condition": "features.quick-shadereffect && features.quick-sprite && features.opengl",
+ "output": [
+ "privateFeature"
+ ]
+ },
"quick-path": {
"label": "Path support",
"purpose": "Provides Path elements in Qt Quick",
diff --git a/src/src.pro b/src/src.pro
index 24e139415b..3bb399acd4 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -10,7 +10,7 @@ qtHaveModule(gui):qtConfig(animation) {
quick \
qmltest
- qtConfig(quick-shadereffect):qtConfig(quick-sprite):qtConfig(opengl(es1|es2)?): \
+ qtConfig(quick-particles): \
SUBDIRS += particles
qtHaveModule(widgets): SUBDIRS += quickwidgets
}