diff options
Diffstat (limited to 'src/corelib/kernel/qmetaobjectbuilder.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 3ba54482f94..5dd86d4b0e4 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -41,16 +41,13 @@ QT_BEGIN_NAMESPACE \value AllPrimaryMembers Add everything except the class name, super class, and static metacall function. */ -// copied from moc's generator.cpp -namespace QtPrivate { -Q_CORE_EXPORT bool isBuiltinType(QByteArrayView type) +static bool isBuiltinType(QByteArrayView type) { int id = QMetaType::fromName(type).id(); if (!id && !type.isEmpty() && type != "void") return false; return (id < QMetaType::User); } -} // namespace QtPrivate // copied from qmetaobject.cpp [[maybe_unused]] static inline const QMetaObjectPrivate *qmobPriv(const uint* data) @@ -1282,7 +1279,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf, } auto getTypeInfo = [&](const auto &typeName) { - if (QtPrivate::isBuiltinType(typeName)) + if (isBuiltinType(typeName)) return QMetaType::fromName(typeName).id(); int index; if constexpr (std::is_same_v<decltype(typeName), const QByteArrayView &>) @@ -1342,7 +1339,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf, [[maybe_unused]] int flags = prop.flags; - if (!QtPrivate::isBuiltinType(prop.type)) + if (isBuiltinType(prop.type)) flags |= EnumOrFlag; if constexpr (mode == Construct) { |