diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-13 07:10:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-13 07:29:03 +0100 |
| commit | 435774ced1f062645a2d48972ac4698c4741c1a7 (patch) | |
| tree | f54c53e361d724068aca48823778bd6425c0016b /src/particles | |
| parent | 77e0dc0485953427320ed0b442ba24eef4f9d73b (diff) | |
| parent | fb0490dd653e4856a3595bd7e49c3127215170d1 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/qml/qqmlimport.cpp
Change-Id: I26f8d18fe8af664ee8573116f182fe12b71e089a
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/particles.pri | 10 | ||||
| -rw-r--r-- | src/particles/qquickparticlesmodule.cpp | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/particles/particles.pri b/src/particles/particles.pri index af71634ec6..576d826903 100644 --- a/src/particles/particles.pri +++ b/src/particles/particles.pri @@ -1,6 +1,5 @@ HEADERS += \ $$PWD/qquickangledirection_p.h \ - $$PWD/qquickcustomparticle_p.h \ $$PWD/qquickcustomaffector_p.h \ $$PWD/qquickellipseextruder_p.h \ $$PWD/qquicktrailemitter_p.h \ @@ -33,7 +32,6 @@ HEADERS += \ SOURCES += \ $$PWD/qquickangledirection.cpp \ - $$PWD/qquickcustomparticle.cpp \ $$PWD/qquickcustomaffector.cpp \ $$PWD/qquickellipseextruder.cpp \ $$PWD/qquicktrailemitter.cpp \ @@ -63,6 +61,14 @@ SOURCES += \ $$PWD/qquickparticlegroup.cpp \ $$PWD/qquickgroupgoal.cpp +qtConfig(quick-shadereffect) { +HEADERS += \ + $$PWD/qquickcustomparticle_p.h + +SOURCES += \ + $$PWD/qquickcustomparticle.cpp +} + OTHER_FILES += \ $$PWD/shaders/customparticletemplate.vert \ $$PWD/shaders/customparticle.vert \ diff --git a/src/particles/qquickparticlesmodule.cpp b/src/particles/qquickparticlesmodule.cpp index accdb668de..03f47a3961 100644 --- a/src/particles/qquickparticlesmodule.cpp +++ b/src/particles/qquickparticlesmodule.cpp @@ -37,8 +37,12 @@ ** ****************************************************************************/ +#include <private/qtquickglobal_p.h> + #include "qquickangledirection_p.h" +#if QT_CONFIG(quick_shadereffect) #include "qquickcustomparticle_p.h" +#endif #include "qquickellipseextruder_p.h" #include "qquicktrailemitter_p.h" #include "qquickfriction_p.h" @@ -84,7 +88,9 @@ void QQuickParticlesModule::defineModule() qmlRegisterType<QQuickParticleGroup>(uri, 2, 0, "ParticleGroup"); qmlRegisterType<QQuickImageParticle>(uri, 2, 0, "ImageParticle"); +#if QT_CONFIG(quick_shadereffect) qmlRegisterType<QQuickCustomParticle>(uri, 2, 0, "CustomParticle"); +#endif qmlRegisterType<QQuickItemParticle>(uri, 2, 0, "ItemParticle"); qmlRegisterType<QQuickParticleEmitter>(uri, 2, 0, "Emitter"); |