diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2014-02-08 00:11:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 01:41:26 +0100 |
| commit | 8f899cd19837e91b52fbeef184a21423bd27815e (patch) | |
| tree | 3e6e3de8aaee884b6469b7039f23f5023ee9cdbe | |
| parent | 4d6cb199b828256cb78ff986f2c1a508b339d2ee (diff) | |
| download | qtbase-8f899cd19837e91b52fbeef184a21423bd27815e.tar.gz qtbase-8f899cd19837e91b52fbeef184a21423bd27815e.tar.bz2 qtbase-8f899cd19837e91b52fbeef184a21423bd27815e.zip | |
Fix build with QT_NO_GRAPHICSEFFECT
Change-Id: Iadc78c270f541067dbbebcf77748077cc3a8be13
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| -rw-r--r-- | src/opengl/qgraphicsshadereffect.cpp | 5 | ||||
| -rw-r--r-- | src/opengl/qgraphicsshadereffect_p.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp index 739be17ef3..736bf10f2e 100644 --- a/src/opengl/qgraphicsshadereffect.cpp +++ b/src/opengl/qgraphicsshadereffect.cpp @@ -40,6 +40,9 @@ ****************************************************************************/ #include "qgraphicsshadereffect_p.h" + +#ifndef QT_NO_GRAPHICSEFFECT + #include "qglshaderprogram.h" #include "gl2paintengineex/qglcustomshaderstage_p.h" #define QGL_HAVE_CUSTOM_SHADERS 1 @@ -311,3 +314,5 @@ void QGraphicsShaderEffect::setUniforms(QGLShaderProgram *program) } QT_END_NAMESPACE + +#endif // QT_NO_GRAPHICSEFFECT diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h index 8a7c082afa..3f879fc2d2 100644 --- a/src/opengl/qgraphicsshadereffect_p.h +++ b/src/opengl/qgraphicsshadereffect_p.h @@ -54,6 +54,9 @@ // #include <QtWidgets/qgraphicseffect.h> + +#ifndef QT_NO_GRAPHICSEFFECT + #include <QtOpenGL/qtopenglglobal.h> QT_BEGIN_NAMESPACE @@ -87,4 +90,6 @@ private: QT_END_NAMESPACE +#endif // QT_NO_GRAPHICSEFFECT + #endif // QGRAPHICSSHADEREFFECT_P_H |