diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-07-23 05:52:38 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-07-23 06:59:55 (GMT) |
| commit | 5234d083c9b00ed508dae7cc8c47d21da46325c6 (patch) | |
| tree | 738a0b5b6f2e73c91dac62e2094a17b66f454c0d | |
| parent | 3f630677d415d4a67938fa6cf64754c80aa30ba0 (diff) | |
| download | Qt-5234d083c9b00ed508dae7cc8c47d21da46325c6.zip Qt-5234d083c9b00ed508dae7cc8c47d21da46325c6.tar.gz Qt-5234d083c9b00ed508dae7cc8c47d21da46325c6.tar.bz2 | |
Fix merge error, restore size of bit field.
Change 34fde4a4 removes one bit from the flags bitfield, which was
added in change 7bc98d7b. This happened during resolving of a
merge conflict and caused some input method related autotests in
tst_QGraphicsView to fail.
Reviewed-by: mbm
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index fee7083..1cf188e 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -440,7 +440,7 @@ public: // New 32 bits quint32 fullUpdatePending : 1; - quint32 flags : 12; + quint32 flags : 13; quint32 dirtyChildrenBoundingRect : 1; quint32 paintedViewBoundingRectsNeedRepaint : 1; quint32 dirtySceneTransform : 1; @@ -453,7 +453,7 @@ public: quint32 acceptedTouchBeginEvent : 1; quint32 filtersDescendantEvents : 1; quint32 sceneTransformTranslateOnly : 1; - quint32 unused : 7; // feel free to use + quint32 unused : 6; // feel free to use // Optional stacking order int globalStackingOrder; |