diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-12 07:22:39 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-12 07:22:39 (GMT) |
| commit | c785d92153d23b836451b0643424b9871bcc4be9 (patch) | |
| tree | fce8119445f239a755bc9be654e6e8d086541285 /examples | |
| parent | fe0f807e1f4e7510c6d8cddd848bcbc25e358651 (diff) | |
| parent | 118412e46f5b5af58eaa3012f9fb086894f9b5f2 (diff) | |
| download | Qt-c785d92153d23b836451b0643424b9871bcc4be9.zip Qt-c785d92153d23b836451b0643424b9871bcc4be9.tar.gz Qt-c785d92153d23b836451b0643424b9871bcc4be9.tar.bz2 | |
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/effects/blurpicker/blureffect.cpp | 4 | ||||
| -rw-r--r-- | examples/effects/blurpicker/blureffect.h | 2 | ||||
| -rw-r--r-- | examples/effects/customshader/blureffect.cpp | 4 | ||||
| -rw-r--r-- | examples/effects/customshader/blureffect.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/effects/blurpicker/blureffect.cpp b/examples/effects/blurpicker/blureffect.cpp index 9046cbd..956637d 100644 --- a/examples/effects/blurpicker/blureffect.cpp +++ b/examples/effects/blurpicker/blureffect.cpp @@ -62,8 +62,8 @@ QRectF BlurEffect::boundingRect() const return QGraphicsBlurEffect::boundingRect(); } -void BlurEffect::draw(QPainter *painter, QGraphicsEffectSource *source) +void BlurEffect::draw(QPainter *painter) { adjustForItem(); - QGraphicsBlurEffect::draw(painter, source); + QGraphicsBlurEffect::draw(painter); } diff --git a/examples/effects/blurpicker/blureffect.h b/examples/effects/blurpicker/blureffect.h index 6cfa55a..3d1d433 100644 --- a/examples/effects/blurpicker/blureffect.h +++ b/examples/effects/blurpicker/blureffect.h @@ -54,7 +54,7 @@ public: QRectF boundingRect() const; - void draw(QPainter *painter, QGraphicsEffectSource *source); + void draw(QPainter *painter); private: void adjustForItem(); diff --git a/examples/effects/customshader/blureffect.cpp b/examples/effects/customshader/blureffect.cpp index 9046cbd..956637d 100644 --- a/examples/effects/customshader/blureffect.cpp +++ b/examples/effects/customshader/blureffect.cpp @@ -62,8 +62,8 @@ QRectF BlurEffect::boundingRect() const return QGraphicsBlurEffect::boundingRect(); } -void BlurEffect::draw(QPainter *painter, QGraphicsEffectSource *source) +void BlurEffect::draw(QPainter *painter) { adjustForItem(); - QGraphicsBlurEffect::draw(painter, source); + QGraphicsBlurEffect::draw(painter); } diff --git a/examples/effects/customshader/blureffect.h b/examples/effects/customshader/blureffect.h index 6cfa55a..3d1d433 100644 --- a/examples/effects/customshader/blureffect.h +++ b/examples/effects/customshader/blureffect.h @@ -54,7 +54,7 @@ public: QRectF boundingRect() const; - void draw(QPainter *painter, QGraphicsEffectSource *source); + void draw(QPainter *painter); private: void adjustForItem(); |