diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-04 04:43:10 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-04 04:43:10 (GMT) |
| commit | 4f6d883c1869104d75cda341738002f18ef3547f (patch) | |
| tree | f1e159fb5b76ccb9b68671c95c822d034daeeab9 /src/gui/effects | |
| parent | eed800e044551118797c5e54fd4fcae9080fa669 (diff) | |
| parent | b28719ab2549918398c35bfa8ea90d0ddbad6a52 (diff) | |
| download | Qt-4f6d883c1869104d75cda341738002f18ef3547f.zip Qt-4f6d883c1869104d75cda341738002f18ef3547f.tar.gz Qt-4f6d883c1869104d75cda341738002f18ef3547f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/gui/effects')
| -rw-r--r-- | src/gui/effects/qgraphicseffect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/effects/qgraphicseffect.h b/src/gui/effects/qgraphicseffect.h index aee7834..61aa21a 100644 --- a/src/gui/effects/qgraphicseffect.h +++ b/src/gui/effects/qgraphicseffect.h @@ -292,7 +292,7 @@ class QGraphicsOpacityEffectPrivate; class Q_GUI_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect { Q_OBJECT - Q_PROPERTY(int opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) + Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) Q_PROPERTY(QBrush opacityMask READ opacityMask WRITE setOpacityMask NOTIFY opacityMaskChanged) public: QGraphicsOpacityEffect(QObject *parent = 0); |