diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-04 07:00:59 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-04 07:00:59 (GMT) |
| commit | e9609ad8eb1a99fc156abf43aa258e5f996d93e7 (patch) | |
| tree | d9d5baf54e9473a41e88c41311935a93f645fdac /src/gui | |
| parent | 974aec137dfdbb1dd68c41113b22eb25131965b8 (diff) | |
| parent | b28719ab2549918398c35bfa8ea90d0ddbad6a52 (diff) | |
| download | Qt-e9609ad8eb1a99fc156abf43aa258e5f996d93e7.zip Qt-e9609ad8eb1a99fc156abf43aa258e5f996d93e7.tar.gz Qt-e9609ad8eb1a99fc156abf43aa258e5f996d93e7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/effects/qgraphicseffect.h | 2 | ||||
| -rw-r--r-- | src/gui/painting/qoutlinemapper.cpp | 2 |
2 files changed, 2 insertions, 2 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); diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp index 216b8c6..8d04a84 100644 --- a/src/gui/painting/qoutlinemapper.cpp +++ b/src/gui/painting/qoutlinemapper.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qoutlinemapper_p.h" - +#include <private/qpainterpath_p.h> #include "qmath.h" #include <stdlib.h> |