1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Bradley T. Hughes 2011-12-13 12:51:06 +01:00 committed by Qt by Nokia
parent a925226d44
commit 0501c9d8f1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qobject.h
View File

@ -106,7 +106,7 @@ public:
uint inEventHandler : 1; //only used if QT_JAMBI_BUILD uint inEventHandler : 1; //only used if QT_JAMBI_BUILD
uint inThreadChangeEvent : 1; uint inThreadChangeEvent : 1;
uint isWindow : 1; //for QWindow uint isWindow : 1; //for QWindow
uint unused : 22; uint unused : 21;
int postedEvents; int postedEvents;
QMetaObject *metaObject; // assert dynamic QMetaObject *metaObject; // assert dynamic
}; };