diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-01 09:23:53 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-06-11 19:39:54 +0200 |
commit | 630c7b481184b5e0dd2e87b967fed421d574ee02 (patch) | |
tree | a6d95f0a479d47c12d791348331f4ab4a215147e /src/dbus | |
parent | 5603be705e9e99b164bb85014c2abd0edf1d13f3 (diff) |
Cleanups in QMetaProperty
This changes the layout of the meta object data, so
also bump the meta object revision.
Original-patch-by: Lars Knoll <lars.knoll@qt.io>
Change-Id: I176fb16c207e8ebe59e358e69554be813406232f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 265d0eacfa..0846c3ed9b 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -432,12 +432,12 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj) header->flags = RequiresVariantMetaObject; header->signalCount = signals_.count(); // These are specific to QDBusMetaObject: - header->propertyDBusData = header->propertyData + header->propertyCount * 3; + header->propertyDBusData = header->propertyData + header->propertyCount * QMetaObjectPrivate::IntsPerProperty; header->methodDBusData = header->propertyDBusData + header->propertyCount * intsPerProperty; int data_size = idata.size() + (header->methodCount * (QMetaObjectPrivate::IntsPerMethod+intsPerMethod)) + methodParametersDataSize + - (header->propertyCount * (3+intsPerProperty)); + (header->propertyCount * (QMetaObjectPrivate::IntsPerProperty+intsPerProperty)); for (const Method &mm : qAsConst(signals_)) data_size += 2 + mm.inputTypes.count() + mm.outputTypes.count(); for (const Method &mm : qAsConst(methods)) @@ -545,6 +545,8 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj) Q_ASSERT(mp.type != QMetaType::UnknownType); idata[offset++] = mp.type; idata[offset++] = mp.flags; + idata[offset++] = -1; // notify index + idata[offset++] = 0; // revision idata[signatureOffset++] = strings.enter(mp.signature); idata[signatureOffset++] = mp.type; |