diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2025-04-17 21:33:54 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2025-07-31 15:38:26 +0300 |
| commit | 1c877f82452ef5e60c369161711d881106b6b87a (patch) | |
| tree | 4a8c2aac336b5ebfd83a501d2de3538716a30dad /src/corelib/kernel/qmetaobjectbuilder.cpp | |
| parent | 82edcc1c326a054a4bf842a019dcfeda6fd9f9d9 (diff) | |
QMetaObject: un-export isBuiltinType() and make it file-static
As pointed out in code review, nothing uses it except
qmetaobjectbuilder.cpp.
The method in the MOC's generator.cpp has been changed, so the comment
isn't correct anymore.
Pick-to: 6.10
Change-Id: Ibe1633eef905053488b443bd0c9f62d11f24abc1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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) { |