diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-08 16:23:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 18:50:23 +0200 |
| commit | 5156fd1abb747b162dde52ce411968f84a42e8fd (patch) | |
| tree | a6b1578304f32616a7dc68ee110238da2030dc8b /src | |
| parent | 035c646df1137eb8192f51701dc926a0f20e7ee8 (diff) | |
Do not use module-include in shader-plugin.
Task-number: QTBUG-27471
Change-Id: I4f15e7358739ac6057798505af5ea4c171207f20
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/shaders/shadereffect.cpp | 1 | ||||
| -rw-r--r-- | src/imports/shaders/shadereffectbuffer.h | 2 | ||||
| -rw-r--r-- | src/imports/shaders/shadereffectitem.cpp | 4 | ||||
| -rw-r--r-- | src/imports/shaders/shadereffectitem.h | 5 | ||||
| -rw-r--r-- | src/imports/shaders/shadereffectsource.cpp | 2 | ||||
| -rw-r--r-- | src/imports/shaders/shadereffectsource.h | 3 |
6 files changed, 10 insertions, 7 deletions
diff --git a/src/imports/shaders/shadereffect.cpp b/src/imports/shaders/shadereffect.cpp index 5bdecb82..522a5085 100644 --- a/src/imports/shaders/shadereffect.cpp +++ b/src/imports/shaders/shadereffect.cpp @@ -45,7 +45,6 @@ #include <QDeclarativeItem> #include <QPainter> -#include <QtOpenGL> static QTransform savedWorldTransform; diff --git a/src/imports/shaders/shadereffectbuffer.h b/src/imports/shaders/shadereffectbuffer.h index 22e4e369..4dcf6e92 100644 --- a/src/imports/shaders/shadereffectbuffer.h +++ b/src/imports/shaders/shadereffectbuffer.h @@ -42,7 +42,7 @@ #ifndef SHADEREFFECTBUFFER_H #define SHADEREFFECTBUFFER_H -#include <QtOpenGL> +#include <QGLFramebufferObject> QT_BEGIN_HEADER diff --git a/src/imports/shaders/shadereffectitem.cpp b/src/imports/shaders/shadereffectitem.cpp index 4fbf116a..85a4076a 100644 --- a/src/imports/shaders/shadereffectitem.cpp +++ b/src/imports/shaders/shadereffectitem.cpp @@ -43,8 +43,10 @@ #include "shadereffect.h" #include "glfunctions.h" +#include <QGLShaderProgram> +#include <QGLFramebufferObject> +#include <QGraphicsView> #include <QPainter> -#include <QtOpenGL> static const char qt_default_vertex_code[] = "uniform highp mat4 qt_ModelViewProjectionMatrix;\n" diff --git a/src/imports/shaders/shadereffectitem.h b/src/imports/shaders/shadereffectitem.h index d2e0c788..ea390625 100644 --- a/src/imports/shaders/shadereffectitem.h +++ b/src/imports/shaders/shadereffectitem.h @@ -43,7 +43,7 @@ #define SHADEREFFECTITEM_H #include <QDeclarativeItem> -#include <QtOpenGL> +#include <QSignalMapper> #include "shadereffectsource.h" #include "scenegraph/qsggeometry.h" @@ -51,6 +51,9 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +class QGLFramebufferObject; +class QGLShaderProgram; + class ShaderEffectItem : public QDeclarativeItem { Q_OBJECT diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp index c0836e86..0582d872 100644 --- a/src/imports/shaders/shadereffectsource.cpp +++ b/src/imports/shaders/shadereffectsource.cpp @@ -44,8 +44,6 @@ #include "shadereffect.h" #include "glfunctions.h" -#include <QtOpenGL> - /*! \qmltype ShaderEffectSource \instantiates ShaderEffectSource diff --git a/src/imports/shaders/shadereffectsource.h b/src/imports/shaders/shadereffectsource.h index 8b7f0bad..8f41088a 100644 --- a/src/imports/shaders/shadereffectsource.h +++ b/src/imports/shaders/shadereffectsource.h @@ -43,7 +43,8 @@ #define SHADEREFFECTSOURCE_H #include <QDeclarativeItem> -#include <QtOpenGL> +#include <QGLFunctions> +#include <QPointer> QT_BEGIN_HEADER |