diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-12 05:34:21 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-12 05:34:21 (GMT) |
commit | 05c1b075f757afcc87748ac6758277eb5c0d8e17 (patch) | |
tree | 9f3159998e643ccd96313c94fb5eac2782aa3aab /src/opengl/qgraphicsshadereffect_p.h | |
parent | 87845845cd5b44bc4ad391ad5ae8499f3850acb3 (diff) | |
parent | db3ae6188c8f88f25b4f8e2645e76a7c6fffef18 (diff) | |
download | Qt-05c1b075f757afcc87748ac6758277eb5c0d8e17.zip Qt-05c1b075f757afcc87748ac6758277eb5c0d8e17.tar.gz Qt-05c1b075f757afcc87748ac6758277eb5c0d8e17.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/opengl/qgraphicsshadereffect_p.h')
-rw-r--r-- | src/opengl/qgraphicsshadereffect_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h index de7f00c..de65ebb 100644 --- a/src/opengl/qgraphicsshadereffect_p.h +++ b/src/opengl/qgraphicsshadereffect_p.h @@ -76,7 +76,7 @@ public: void setPixelShaderFragment(const QByteArray& code); protected: - void draw(QPainter *painter, QGraphicsEffectSource *source); + void draw(QPainter *painter); void setUniformsDirty(); virtual void setUniforms(QGLShaderProgram *program); |