diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-08-22 10:22:55 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-08-25 03:31:28 -0300 |
| commit | d2e9d70ec1f5e09bbd2fe6ea0ab94724ef9275bf (patch) | |
| tree | 811425547c33b3c50fbe725ab72c24eb08b4b7d7 /src/dbus | |
| parent | c1bdaf0a1a5440050b9d3f2ac02123c663c32977 (diff) | |
QMetaObject: add revision 11 for Qt 6.5
We changed qTryMetaTypeInterfaceForType() so it does record void and
void* (see commit 2d0c31e7d92a3e9df4ce2b9c1d41b94fb12735fc and commit
3695b35dfc427f274e55f8e2a6a9876deb52f1b4). By incrementing the revision
number, we make it possible to determine at runtime whether the new
information ought to be present.
We may add even more types (namely, non-const references) before 6.5.0
is out. For pointers, the restriction remains that the metatype is
recorded only if the pointer is a pointer to a complete type.
Change-Id: Ic6547f8247454b47baa8fffd170dad79b1a90f6b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index c7ae280295..725d6d4d6b 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -391,7 +391,7 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj) - methods.count(); // ditto QDBusMetaObjectPrivate *header = reinterpret_cast<QDBusMetaObjectPrivate *>(idata.data()); - static_assert(QMetaObjectPrivate::OutputRevision == 10, "QtDBus meta-object generator should generate the same version as moc"); + static_assert(QMetaObjectPrivate::OutputRevision == 11, "QtDBus meta-object generator should generate the same version as moc"); header->revision = QMetaObjectPrivate::OutputRevision; header->className = 0; header->classInfoCount = 0; @@ -486,7 +486,7 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj) typeInfo = IsUnresolvedType | strings.enter(typeName); else typeInfo = type; - metaTypes[currentMethodMetaTypeOffset++] = QMetaType (type); + metaTypes[currentMethodMetaTypeOffset++] = QMetaType(type); idata[parametersOffset++] = typeInfo; } // Parameter names |