diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2011-03-23 13:40:34 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2011-03-23 13:40:34 (GMT) |
| commit | 98d65b5967d5f8a1648d73185986fabab97e692b (patch) | |
| tree | 4440dbf9bbea48c27a90333981307fef734eb946 /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | 1e5a471645ea8c91b0a2dc0fe019f15fdc5f9127 (diff) | |
| parent | 8700366079f6346ab0ba8baa624993832127188e (diff) | |
| download | Qt-98d65b5967d5f8a1648d73185986fabab97e692b.zip Qt-98d65b5967d5f8a1648d73185986fabab97e692b.tar.gz Qt-98d65b5967d5f8a1648d73185986fabab97e692b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 5c82116..90ff43f 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -559,7 +559,7 @@ public: quint32 dirtyChildrenBoundingRect : 1; // Packed 32 bits - quint32 flags : 18; + quint32 flags : 19; quint32 paintedViewBoundingRectsNeedRepaint : 1; quint32 dirtySceneTransform : 1; quint32 geometryChanged : 1; @@ -573,9 +573,9 @@ public: quint32 sceneTransformTranslateOnly : 1; quint32 notifyBoundingRectChanged : 1; quint32 notifyInvalidated : 1; - quint32 mouseSetsFocus : 1; // New 32 bits + quint32 mouseSetsFocus : 1; quint32 explicitActivate : 1; quint32 wantsActive : 1; quint32 holesInSiblingIndex : 1; @@ -586,7 +586,7 @@ public: quint32 mayHaveChildWithGraphicsEffect : 1; quint32 isDeclarativeItem : 1; quint32 sendParentChangeNotification : 1; - quint32 padding : 22; + quint32 padding : 21; // Optional stacking order int globalStackingOrder; |