diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-12-13 12:51:06 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-15 08:17:49 +0100 |
| commit | 0501c9d8f16183de2857fd58750a3876283ca8c5 (patch) | |
| tree | 6e36d329497598eeb3ad450852796ef107cec16d /src/corelib/kernel/qobject.h | |
| parent | a925226d447a2a020ee1a5ce964be435c702c515 (diff) | |
Correct sizeof(QObjectData) after out-of-order cherry-picks by Gerrit
Commits a6ae75f92a8628c727a9c5a9961fa91c583c008e and
6f0f9f69288925ef423c542ef5eb7302a5431867 were cherry-picked in the wrong
order (despite the dependencies shown in Gerrit), causing the
QObjectData::unused bitfield to be too large.
Change-Id: I65acaa8b507f7f6f2c5735f45bd0ad8343abea54
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index a0d8076b73..3729dc8c0d 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -106,7 +106,7 @@ public: uint inEventHandler : 1; //only used if QT_JAMBI_BUILD uint inThreadChangeEvent : 1; uint isWindow : 1; //for QWindow - uint unused : 22; + uint unused : 21; int postedEvents; QMetaObject *metaObject; // assert dynamic }; |