diff options
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusabstractadaptor.cpp | 6 | ||||
-rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index dda20cde04..39584c436c 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -395,13 +395,9 @@ void QDBusAdaptorConnector::qt_static_metacall(QObject *_o, QMetaObject::Call _c } } -const QMetaObjectExtraData QDBusAdaptorConnector::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - const QMetaObject QDBusAdaptorConnector::staticMetaObject = { { &QObject::staticMetaObject, qt_meta_stringdata_QDBusAdaptorConnector.data, - qt_meta_data_QDBusAdaptorConnector, &staticMetaObjectExtraData } + qt_meta_data_QDBusAdaptorConnector, qt_static_metacall, 0, 0 } }; const QMetaObject *QDBusAdaptorConnector::metaObject() const diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 4fbf67a8b2..5570dac71d 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -542,6 +542,8 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj) // put the metaobject together obj->d.data = uint_data; + obj->d.relatedMetaObjects = 0; + obj->d.static_metacall = 0; obj->d.extradata = 0; obj->d.stringdata = reinterpret_cast<const QByteArrayData *>(string_data); obj->d.superdata = &QDBusAbstractInterface::staticMetaObject; @@ -564,6 +566,8 @@ void QDBusMetaObjectGenerator::writeWithoutXml(const QString &interface) stringdata[name.length()] = '\0'; d.data = reinterpret_cast<uint*>(header); + d.relatedMetaObjects = 0; + d.static_metacall = 0; d.extradata = 0; d.stringdata = stringdata; d.superdata = &QDBusAbstractInterface::staticMetaObject; |