diff options
| author | axis <qt-info@nokia.com> | 2009-11-09 08:28:40 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-09 08:28:40 (GMT) |
| commit | 7fdfa58b958b658feb7b20dd7a7322d235fe4bea (patch) | |
| tree | 6c38ed48f7c234ad480aa8ce178b9a00b14d2440 /src/gui/graphicsview/qgraphicsitem.h | |
| parent | 7ea04bf5c065a037b2db667572e1947f1a1b8b2e (diff) | |
| parent | 68409c24211b4639832ce86113c33a247bb68950 (diff) | |
| download | Qt-7fdfa58b958b658feb7b20dd7a7322d235fe4bea.zip Qt-7fdfa58b958b658feb7b20dd7a7322d235fe4bea.tar.gz Qt-7fdfa58b958b658feb7b20dd7a7322d235fe4bea.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Conflicts:
src/gui/painting/qblendfunctions.cpp
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index f091e34..8bbe9f1 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -105,7 +105,8 @@ public: ItemAcceptsInputMethod = 0x1000, ItemNegativeZStacksBehindParent = 0x2000, ItemIsPanel = 0x4000, - ItemIsFocusScope = 0x8000 // internal + ItemIsFocusScope = 0x8000, // internal + ItemSendsScenePositionChanges = 0x10000 // NB! Don't forget to increase the d_ptr->flags bit field by 1 when adding a new flag. }; Q_DECLARE_FLAGS(GraphicsItemFlags, GraphicsItemFlag) @@ -137,7 +138,8 @@ public: ItemZValueChange, ItemZValueHasChanged, ItemOpacityChange, - ItemOpacityHasChanged + ItemOpacityHasChanged, + ItemScenePositionHasChanged }; enum CacheMode { @@ -225,9 +227,11 @@ public: qreal effectiveOpacity() const; void setOpacity(qreal opacity); +#ifndef QT_NO_GRAPHICSEFFECT // Effect QGraphicsEffect *graphicsEffect() const; void setGraphicsEffect(QGraphicsEffect *effect); +#endif //QT_NO_GRAPHICSEFFECT Qt::MouseButtons acceptedMouseButtons() const; void setAcceptedMouseButtons(Qt::MouseButtons buttons); |