OSDN Git Service

remove QMetaObjectExtraData and put everything into QMetaObject
authorIvailo Monev <xakepa10@gmail.com>
Sat, 9 Jan 2016 17:55:15 +0000 (19:55 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Sat, 9 Jan 2016 17:55:15 +0000 (19:55 +0200)
commitdf31068ba97bddc3309f20c66e59c2be7a423eda
tree88c067e765398298ef8244a0b35dcc7b57b4c16d
parent1ba689a9cdc23e7cc1583fb379b93841f0c5489c
remove QMetaObjectExtraData and put everything into QMetaObject

upstream commits:
https://github.com/qtproject/qtbase/commit/67f58040ea10255af2c09149f16ce683f00dc7a2

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/core/kernel/qmetaobject.cpp
src/core/kernel/qobject.cpp
src/core/kernel/qobjectdefs.h
src/core/statemachine/qstatemachine.cpp
src/dbus/qdbusabstractadaptor.cpp
src/dbus/qdbusmetaobject.cpp
src/declarative/qml/qmetaobjectbuilder.cpp
src/declarative/qml/qmetaobjectbuilder_p.h
src/script/bridge/qscriptqobject.cpp
src/tools/moc/generator.cpp
src/tools/moc/outputrevision.h