From 547224c750a090222836f90532ff405ed5171358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Nilsen?= Date: Thu, 20 Aug 2009 22:16:42 +0200 Subject: Add "QObject *parent = 0" to QGraphicsShaderEffect constructor. See also 39f5298ef2c0424e7b4916d8d1de1d46e534daee --- src/opengl/qgraphicsshadereffect.cpp | 4 ++-- 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; -- cgit v0.12