From 630c7b481184b5e0dd2e87b967fed421d574ee02 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 1 Apr 2020 09:23:53 +0200 Subject: Cleanups in QMetaProperty This changes the layout of the meta object data, so also bump the meta object revision. Original-patch-by: Lars Knoll Change-Id: I176fb16c207e8ebe59e358e69554be813406232f Reviewed-by: Ulf Hermann --- src/dbus/qdbusmetaobject.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/dbus') 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; -- cgit v1.2.3