diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 16:38:25 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 16:38:25 (GMT) |
| commit | 123a3aacd6a40fb07a225ef4db34ff7f986363ce (patch) | |
| tree | 69744fb08a3b0dd4e246b90d2e90d4f533ca768b /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | f92501a82f5bca1ccac07ed17850c84b281a1fb1 (diff) | |
| parent | 12689cc05936d675c8a7065cf39b8334b83f95bb (diff) | |
| download | Qt-123a3aacd6a40fb07a225ef4db34ff7f986363ce.zip Qt-123a3aacd6a40fb07a225ef4db34ff7f986363ce.tar.gz Qt-123a3aacd6a40fb07a225ef4db34ff7f986363ce.tar.bz2 | |
Merge remote-tracking branch 'mainline/4.7' into 4.7
Conflicts:
dist/changes-4.7.4
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; |