diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-29 13:46:13 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-29 13:46:13 (GMT) |
| commit | 24f041b30f576a2f6ca1cd9e07cba91fc32fac59 (patch) | |
| tree | f068c9beff2b5c38863cc00092e748552501ebe0 /src/opengl/qgraphicsshadereffect.h | |
| parent | 07c2b17276057a8b47c3be57ab7c2cf66dac0edd (diff) | |
| download | Qt-24f041b30f576a2f6ca1cd9e07cba91fc32fac59.zip Qt-24f041b30f576a2f6ca1cd9e07cba91fc32fac59.tar.gz Qt-24f041b30f576a2f6ca1cd9e07cba91fc32fac59.tar.bz2 | |
Conflicts after merge commit 07c2b17276057a8b47c3be57ab7c2cf66dac0edd
Makes QGraphicsShaderEffect compatible with the new QGraphicsEffect API.
Diffstat (limited to 'src/opengl/qgraphicsshadereffect.h')
| -rw-r--r-- | src/opengl/qgraphicsshadereffect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgraphicsshadereffect.h b/src/opengl/qgraphicsshadereffect.h index 032a233..d9f2d4f 100644 --- a/src/opengl/qgraphicsshadereffect.h +++ b/src/opengl/qgraphicsshadereffect.h @@ -67,7 +67,7 @@ public: void setPixelShaderFragment(const QByteArray& code); protected: - void draw(QPainter *painter); + void draw(QPainter *painter, QGraphicsEffectSource *source); void setUniformsDirty(); virtual void setUniforms(QGLShaderProgram *program); |