diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-09 08:47:10 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-11 02:52:03 +0000 |
| commit | 93dc459f488f866db79ede1f27ef739a243764e4 (patch) | |
| tree | 8c5b859d5d7e093695a364b3257d31c70732c7e5 /src/opengl | |
| parent | bb1e5675a5628b72edd32b975e78b7feba366ff9 (diff) | |
Convert features.graphicseffect to QT_[REQUIRE_]CONFIG
Change-Id: I1bb96088b2e9f2a2cfab5fceeebebe94fa6bb3a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/opengl.pro | 7 | ||||
| -rw-r--r-- | src/opengl/qgraphicsshadereffect.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qgraphicsshadereffect_p.h | 7 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 718a886809..016db46405 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -33,7 +33,6 @@ SOURCES += qgl.cpp \ qglbuffer.cpp \ HEADERS += qglshaderprogram.h \ - qgraphicsshadereffect_p.h \ gl2paintengineex/qglgradientcache_p.h \ gl2paintengineex/qglengineshadermanager_p.h \ gl2paintengineex/qgl2pexvertexarray_p.h \ @@ -44,7 +43,6 @@ HEADERS += qglshaderprogram.h \ gl2paintengineex/qglshadercache_p.h SOURCES += qglshaderprogram.cpp \ - qgraphicsshadereffect.cpp \ gl2paintengineex/qglgradientcache.cpp \ gl2paintengineex/qglengineshadermanager.cpp \ gl2paintengineex/qgl2pexvertexarray.cpp \ @@ -52,4 +50,9 @@ SOURCES += qglshaderprogram.cpp \ gl2paintengineex/qglcustomshaderstage.cpp \ gl2paintengineex/qtextureglyphcache_gl.cpp +qtConfig(graphicseffect) { + HEADERS += qgraphicsshadereffect_p.h + SOURCES += qgraphicsshadereffect.cpp +} + load(qt_module) diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp index d5ee281c2f..218f4af866 100644 --- a/src/opengl/qgraphicsshadereffect.cpp +++ b/src/opengl/qgraphicsshadereffect.cpp @@ -39,8 +39,6 @@ #include "qgraphicsshadereffect_p.h" -#ifndef QT_NO_GRAPHICSEFFECT - #include "qglshaderprogram.h" #include "gl2paintengineex/qglcustomshaderstage_p.h" #define QGL_HAVE_CUSTOM_SHADERS 1 @@ -312,5 +310,3 @@ 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 57326fdaf2..d7e0ec51d4 100644 --- a/src/opengl/qgraphicsshadereffect_p.h +++ b/src/opengl/qgraphicsshadereffect_p.h @@ -53,12 +53,11 @@ #include <QtWidgets/qgraphicseffect.h> -#ifndef QT_NO_GRAPHICSEFFECT - #include <QtOpenGL/qtopenglglobal.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(graphicseffect); +QT_BEGIN_NAMESPACE class QGLShaderProgram; class QGLCustomShaderEffectStage; @@ -88,6 +87,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSEFFECT - #endif // QGRAPHICSSHADEREFFECT_P_H |