diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-15 09:10:43 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-15 09:10:43 (GMT) |
| commit | 06d71fb79ad850c62a1b95fbeec607dfc4220489 (patch) | |
| tree | 78698d4ab162020c725ed06fa73aa27776f3e5ec /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | e85223d233c0e1d6beca748332b8fbaba3ebbf2d (diff) | |
| parent | 2b768dc774a5a957e7806515db3c7976bb9e337c (diff) | |
| download | Qt-06d71fb79ad850c62a1b95fbeec607dfc4220489.zip Qt-06d71fb79ad850c62a1b95fbeec607dfc4220489.tar.gz Qt-06d71fb79ad850c62a1b95fbeec607dfc4220489.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging 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 922581d..f922842 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -237,6 +237,7 @@ public: scenePosDescendants(0), pendingPolish(0), mayHaveChildWithGraphicsEffect(0), + isDeclarativeItem(0), globalStackingOrder(-1), q_ptr(0) { @@ -576,7 +577,8 @@ public: quint32 scenePosDescendants : 1; quint32 pendingPolish : 1; quint32 mayHaveChildWithGraphicsEffect : 1; - quint32 padding : 25; + quint32 isDeclarativeItem : 1; + quint32 padding : 24; // Optional stacking order int globalStackingOrder; |