Fix build for -no-feature-quick-shadereffect

Change-Id: I334603209818a8030ddb5b5b316cab596c328bf1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

5 files changed, 18 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");
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 28e9173bf7..9dd72a40e3 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -46,6 +46,7 @@
 #include <private/qsgadaptationlayer_p.h>
 #include <QtQuick/private/qquickpixmapcache_p.h>
 #include <QtGui/QGuiApplication>
+#include <qsgtextureprovider.h>
 
 #include <qqmlinfo.h>
 #include <private/qqmlengine_p.h>
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index bcaedd67b4..05bb3681d7 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -42,7 +42,9 @@
 #include "qquickcanvasitem_p.h"
 #include <private/qquickcontext2dtexture_p.h>
 #include <private/qquickitem_p.h>
+#if QT_CONFIG(quick_shadereffect)
 #include <QtQuick/private/qquickshadereffectsource_p.h>
+#endif
 #include <qsgrendererinterface.h>
 
 #include <QtQuick/private/qsgcontext_p.h>
diff --git a/src/quick/items/qquickpainteditem_p.h b/src/quick/items/qquickpainteditem_p.h
index 742e786335..3d2ec631fa 100644
--- a/src/quick/items/qquickpainteditem_p.h
+++ b/src/quick/items/qquickpainteditem_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include "qquickpainteditem.h"
 #include "qquickitem_p.h"
 #include <QtGui/qcolor.h>