diff options
author | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
---|---|---|
committer | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
commit | e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d (patch) | |
tree | 08fa39a9605ec38a45247baea0e2053179f5970f /src/gui/graphicsview/qgraphicsitem_p.h | |
parent | 838ed9c68aef4d5a4f0b4d4dbbc1c1f7797cde91 (diff) | |
parent | 901ea45ca02dc8fbbf3f6112240c4e468c240b73 (diff) | |
download | Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.zip Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.gz Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.bz2 |
Merge commit 'origin/master' into fileEngines
Conflicts:
src/s60installs/bwins/QtCoreu.def
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; |