diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-06 22:25:01 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-06 22:25:01 (GMT) |
| commit | 3f109fd85cbdc49dc3ef1c14066073079f4e34bf (patch) | |
| tree | 0835717bbe2d0c3b79bed2146ea72bf494111913 /examples/effects/customshader | |
| parent | f8b043f1d73906be593232cf02aa06e576ae4e27 (diff) | |
| download | Qt-3f109fd85cbdc49dc3ef1c14066073079f4e34bf.zip Qt-3f109fd85cbdc49dc3ef1c14066073079f4e34bf.tar.gz Qt-3f109fd85cbdc49dc3ef1c14066073079f4e34bf.tar.bz2 | |
Make QGraphicsShaderEffect private API for 4.6
The custom shader code in the OpenGL2 paint engine needs time to
mature before we make this official public API.
Reviewed-by: trustme
Diffstat (limited to 'examples/effects/customshader')
| -rw-r--r-- | examples/effects/customshader/blureffect.cpp | 4 | ||||
| -rw-r--r-- | examples/effects/customshader/blureffect.h | 4 | ||||
| -rw-r--r-- | examples/effects/customshader/customshadereffect.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/effects/customshader/blureffect.cpp b/examples/effects/customshader/blureffect.cpp index 6fe8e86..f9e046e 100644 --- a/examples/effects/customshader/blureffect.cpp +++ b/examples/effects/customshader/blureffect.cpp @@ -56,10 +56,10 @@ void BlurEffect::adjustForItem() setBlurRadius(radius); } -QRectF BlurEffect::boundingRectFor(const QRectF &rect) const +QRectF BlurEffect::boundingRect() const { const_cast<BlurEffect *>(this)->adjustForItem(); - return QGraphicsBlurEffect::boundingRectFor(rect); + return QGraphicsBlurEffect::boundingRect(); } void BlurEffect::draw(QPainter *painter, QGraphicsEffectSource *source) diff --git a/examples/effects/customshader/blureffect.h b/examples/effects/customshader/blureffect.h index 0cafd80..7c12ccf 100644 --- a/examples/effects/customshader/blureffect.h +++ b/examples/effects/customshader/blureffect.h @@ -52,9 +52,9 @@ public: void setBaseLine(qreal y) { m_baseLine = y; } - QRectF boundingRectFor(const QRectF &) const; + QRectF boundingRect() const; - void draw(QPainter *painter, QGraphicsEffectSource*); + void draw(QPainter *painter, QGraphicsEffectSource *source); private: void adjustForItem(); diff --git a/examples/effects/customshader/customshadereffect.h b/examples/effects/customshader/customshadereffect.h index 9ba5f15..6892d96 100644 --- a/examples/effects/customshader/customshadereffect.h +++ b/examples/effects/customshader/customshadereffect.h @@ -43,7 +43,7 @@ #define CUSTOMSHADEREFFECT_H #include <QGraphicsEffect> -#include <QGraphicsShaderEffect> +#include <QtOpenGL/private/qgraphicsshadereffect_p.h> #include <QGraphicsItem> class CustomShaderEffect: public QGraphicsShaderEffect |