diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-01 17:53:25 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-01 17:53:25 (GMT) |
| commit | 4cdaadb332a49513d6082b6ea723dc1968b3ad30 (patch) | |
| tree | fbcbf013e29ad3e4c718dca5ca2dc25d2f9498ff /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | 7799c68a964dd9a26cc98fa4b810fce7cc333e27 (diff) | |
| parent | 5d95b43762a16a37a20b3288c74976f6e62075d3 (diff) | |
| download | Qt-4cdaadb332a49513d6082b6ea723dc1968b3ad30.zip Qt-4cdaadb332a49513d6082b6ea723dc1968b3ad30.tar.gz Qt-4cdaadb332a49513d6082b6ea723dc1968b3ad30.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 77e4054..c8a7699 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -238,6 +238,7 @@ public: pendingPolish(0), mayHaveChildWithGraphicsEffect(0), isDeclarativeItem(0), + sendParentChangeNotification(0), globalStackingOrder(-1), q_ptr(0) { @@ -584,7 +585,8 @@ public: quint32 pendingPolish : 1; quint32 mayHaveChildWithGraphicsEffect : 1; quint32 isDeclarativeItem : 1; - quint32 padding : 23; + quint32 sendParentChangeNotification : 1; + quint32 padding : 22; // Optional stacking order int globalStackingOrder; |