diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 16:28:07 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 16:28:07 +0100 |
commit | a9c88c1f39c41215eb9d7288a1fd02aa865e8a04 (patch) | |
tree | d6229a2370f202d5ff8a5f56da1f43982bc524c2 /src/opengl | |
parent | ff23fb6cf723bcc52a5f037ef92500c480ce5a5c (diff) | |
parent | 8e22d71b225576ae7ccd6ed349c05219bae7689e (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qimage.cpp
src/gui/text/qtextengine.cpp
src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
src/printsupport/kernel/qprintengine_win.cpp
Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444
Diffstat (limited to 'src/opengl')
-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 |