summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qmetatype.h4
-rw-r--r--src/corelib/kernel/qtmochelpers.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 3ea98353d29..f55b9715b98 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -766,9 +766,9 @@ public:
static void unregisterMetaType(QMetaType type);
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
- const QtPrivate::QMetaTypeInterface *iface() { return d_ptr; }
+ constexpr const QtPrivate::QMetaTypeInterface *iface() { return d_ptr; }
#endif
- const QtPrivate::QMetaTypeInterface *iface() const { return d_ptr; }
+ constexpr const QtPrivate::QMetaTypeInterface *iface() const { return d_ptr; }
private:
static bool isDefaultConstructible(const QtPrivate::QMetaTypeInterface *) noexcept Q_DECL_PURE_FUNCTION;
diff --git a/src/corelib/kernel/qtmochelpers.h b/src/corelib/kernel/qtmochelpers.h
index a253e7a1291..e90dd1c9df3 100644
--- a/src/corelib/kernel/qtmochelpers.h
+++ b/src/corelib/kernel/qtmochelpers.h
@@ -590,9 +590,7 @@ constexpr auto metaObjectData(uint flags, const Strings &strings,
dataoffset += enums.dataSize();
// the meta type referring to the object itself
- result.relocatingData.metaTypes[metatypeoffset++] =
- QtPrivate::qTryMetaTypeInterfaceForType<void,
- QtPrivate::TypeAndForceComplete<ObjectType, std::true_type>>();
+ result.relocatingData.metaTypes[metatypeoffset++] = QMetaType::fromType<ObjectType>().iface();
data[4] = methods.count();
data[5] = methods.count() ? dataoffset : 0;