diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-20 20:16:42 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-20 20:16:42 (GMT) |
| commit | 547224c750a090222836f90532ff405ed5171358 (patch) | |
| tree | 8ba50075dace827bbd8214c2a4bfbcb6c584e972 | |
| parent | ee2670460af760bf07c47950a8cca37bd6814f2b (diff) | |
| download | Qt-547224c750a090222836f90532ff405ed5171358.zip Qt-547224c750a090222836f90532ff405ed5171358.tar.gz Qt-547224c750a090222836f90532ff405ed5171358.tar.bz2 | |
Add "QObject *parent = 0" to QGraphicsShaderEffect constructor.
See also 39f5298ef2c0424e7b4916d8d1de1d46e534daee
| -rw-r--r-- | src/opengl/qgraphicsshadereffect.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qgraphicsshadereffect.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp index e8d9ae3..e8741b5 100644 --- a/src/opengl/qgraphicsshadereffect.cpp +++ b/src/opengl/qgraphicsshadereffect.cpp @@ -182,8 +182,8 @@ public: /*! Constructs a shader effect and attaches it to \a parent. */ -QGraphicsShaderEffect::QGraphicsShaderEffect() - : QGraphicsEffect(*new QGraphicsShaderEffectPrivate()) +QGraphicsShaderEffect::QGraphicsShaderEffect(QObject *parent) + : QGraphicsEffect(*new QGraphicsShaderEffectPrivate(), parent) { } diff --git a/src/opengl/qgraphicsshadereffect.h b/src/opengl/qgraphicsshadereffect.h index 29b7c9f..1612431 100644 --- a/src/opengl/qgraphicsshadereffect.h +++ b/src/opengl/qgraphicsshadereffect.h @@ -60,7 +60,7 @@ class Q_OPENGL_EXPORT QGraphicsShaderEffect : public QGraphicsEffect { Q_OBJECT public: - QGraphicsShaderEffect(); + QGraphicsShaderEffect(QObject *parent = 0); virtual ~QGraphicsShaderEffect(); QByteArray pixelShaderFragment() const; |