diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-31 10:02:35 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-08-01 14:52:33 -0700 |
| commit | 777c7a2288ee111a668e17bbbb03b386c1f05737 (patch) | |
| tree | 174eed115f0b477e1caeca37b742eb4d1b66c5df /src/corelib/kernel/qmetaobject.cpp | |
| parent | a4e0f070ae156ec01897cd9d35781f92fc146344 (diff) | |
QMetaObject: fix check for void's metatype in metaType()
Pointer comparison is not sufficient on most platforms.
Change-Id: I6f936da6f6e84d649f70fffd1706f8b1f0654a1e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 80c511107a..48f27f9bc7 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -6,6 +6,7 @@ #include "qmetatype.h" #include "qobject.h" #include "qmetaobject_p.h" +#include "qmetatype_p.h" #include <qcoreapplication.h> #include <qcoreevent.h> @@ -405,7 +406,7 @@ QMetaType QMetaObject::metaType() const data:QMetaType(prop0), ..., QMetaType(propPropCount-1), QMetaType(class),... */ auto iface = this->d.metaTypes[d->propertyCount]; - if (iface == QtPrivate::qMetaTypeInterfaceForType<void>()) + if (iface && QtMetaTypePrivate::isInterfaceFor<void>(iface)) return QMetaType(); // return invalid meta-type for namespaces if (iface) return QMetaType(iface); |