From 0501c9d8f16183de2857fd58750a3876283ca8c5 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Tue, 13 Dec 2011 12:51:06 +0100 Subject: 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 --- src/corelib/kernel/qobject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/kernel/qobject.h') 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 }; -- cgit v1.2.3