Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60

1 files changed, 10 insertions, 4 deletions

diff --git a/src/gui/effects/qgraphicseffect.h b/src/gui/effects/qgraphicseffect.h
index bf18581..7335a25 100644
--- a/src/gui/effects/qgraphicseffect.h
+++ b/src/gui/effects/qgraphicseffect.h
@@ -183,22 +183,28 @@ class Q_GUI_EXPORT QGraphicsBlurEffect: public QGraphicsEffect
 {
     Q_OBJECT
     Q_PROPERTY(qreal blurRadius READ blurRadius WRITE setBlurRadius NOTIFY blurRadiusChanged)
-    Q_PROPERTY(Qt::RenderHint blurHint READ blurHint WRITE setBlurHint NOTIFY blurHintChanged)
+    Q_PROPERTY(BlurHint blurHint READ blurHint WRITE setBlurHint NOTIFY blurHintChanged)
 public:
+    enum BlurHint {
+        QualityHint,
+        PerformanceHint,
+        AnimationHint
+    };
+
     QGraphicsBlurEffect(QObject *parent = 0);
     ~QGraphicsBlurEffect();
 
     QRectF boundingRectFor(const QRectF &rect) const;
     qreal blurRadius() const;
-    Qt::RenderHint blurHint() const;
+    BlurHint blurHint() const;
 
 public Q_SLOTS:
     void setBlurRadius(qreal blurRadius);
-    void setBlurHint(Qt::RenderHint hint);
+    void setBlurHint(BlurHint hint);
 
 Q_SIGNALS:
     void blurRadiusChanged(qreal blurRadius);
-    void blurHintChanged(Qt::RenderHint hint);
+    void blurHintChanged(BlurHint hint);
 
 protected:
     void draw(QPainter *painter, QGraphicsEffectSource *source);