diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-26 13:09:34 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-26 13:10:31 (GMT) |
| commit | 25c7f57c21dd22eaa38b4b511aa754a1be711bf1 (patch) | |
| tree | c18fc68340d19443ac1bb399b1192617795e4d29 | |
| parent | 3d1cf992b28ffa9f3b18414bddd24865075fd953 (diff) | |
| download | Qt-25c7f57c21dd22eaa38b4b511aa754a1be711bf1.zip Qt-25c7f57c21dd22eaa38b4b511aa754a1be711bf1.tar.gz Qt-25c7f57c21dd22eaa38b4b511aa754a1be711bf1.tar.bz2 | |
Remove Graphics View dependency from QGraphicsShaderEffect.
Graphics effects are no longer in the Graphics View module.
| -rw-r--r-- | src/opengl/qgraphicsshadereffect.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qgraphicsshadereffect.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp index e8cc7a1..293413c 100644 --- a/src/opengl/qgraphicsshadereffect.cpp +++ b/src/opengl/qgraphicsshadereffect.cpp @@ -51,8 +51,6 @@ QT_BEGIN_NAMESPACE -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW - /*! \class QGraphicsShaderEffect \brief The QGraphicsShaderEffect class is the base class for creating @@ -313,6 +311,4 @@ void QGraphicsShaderEffect::setUniforms(QGLShaderProgram *program) Q_UNUSED(program); } -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE diff --git a/src/opengl/qgraphicsshadereffect.h b/src/opengl/qgraphicsshadereffect.h index c4637d7..672973b 100644 --- a/src/opengl/qgraphicsshadereffect.h +++ b/src/opengl/qgraphicsshadereffect.h @@ -50,8 +50,6 @@ QT_BEGIN_NAMESPACE QT_MODULE(OpenGL) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW - class QGLShaderProgram; class QGLCustomShaderEffectStage; class QGraphicsShaderEffectPrivate; @@ -78,8 +76,6 @@ private: friend class QGLCustomShaderEffectStage; }; -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE QT_END_HEADER |