Remove QMetaObjectExtraData and put everything into QMetaObject
authorOlivier Goffart <ogoffart@woboq.com>
Fri, 13 Jan 2012 19:09:19 +0000 (20:09 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 25 Apr 2012 18:19:29 +0000 (20:19 +0200)
commit67f58040ea10255af2c09149f16ce683f00dc7a2
treee6bc102b638da2821d9211d9134a46e57f6fa7d8
parent7b118c6456ba85a9f1c2fc0406d52829f1c8cdae
Remove QMetaObjectExtraData and put everything into QMetaObject

QMetaObjectExtraData was added when support for QMetaObject::newInstance
was added. One needed a place to put the pointer to static_metacall in
the QMetaObject.

But as we break binary compatibility, one can change the size of
QMetaObject, and put everything back inside QMetaObject's own structure.
Meaning it is not required anymore to have one QMetaObjectExtraData
instance per QMetaObject anymore.

Change-Id: If0b8f586cbaf633eed10045adee3ba3366826c86
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 files changed:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qmetaobjectbuilder.cpp
src/corelib/kernel/qmetaobjectbuilder_p.h
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobjectdefs.h
src/corelib/statemachine/qstatemachine.cpp
src/dbus/qdbusabstractadaptor.cpp
src/dbus/qdbusmetaobject.cpp
src/tools/moc/generator.cpp
src/tools/moc/outputrevision.h
tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
tests/auto/tools/moc/tst_moc.cpp