Correct sizeof(QObjectData) after out-of-order cherry-picks by Gerrit

Commits a6ae75f92a and
6f0f9f6928 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>

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
 };