diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp index be9db84272..962245fa4c 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp @@ -196,7 +196,7 @@ QQmlEngineDebugServiceImpl::propertyData(QObject *obj, int propIdx) rv.value = valueContents(prop.read(obj)); - if (QQmlMetaType::isQObject(prop.userType())) { + if (prop.metaType().flags().testFlag(QMetaType::PointerToQObject)) { rv.type = QQmlObjectProperty::Object; } else if (QQmlMetaType::isList(prop.userType())) { rv.type = QQmlObjectProperty::List; @@ -275,7 +275,7 @@ QVariant QQmlEngineDebugServiceImpl::valueContents(QVariant value) const return value; } - if (QQmlMetaType::isQObject(metaTypeId)) { + if (metaType.flags().testFlag(QMetaType::PointerToQObject)) { QObject *o = QQmlMetaType::toQObject(value); if (o) { QString name = o->objectName(); diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 8369634889..71abce89b1 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -1099,14 +1099,6 @@ QObject *QQmlMetaType::toQObject(const QVariant &v, bool *ok) return *(QObject *const *)v.constData(); } -bool QQmlMetaType::isQObject(int userType) -{ - if (userType == QMetaType::QObjectStar) - return true; - QMetaType type (userType); - return type.flags().testFlag(QMetaType::PointerToQObject); -} - /* Returns the item type for a list of type \a id. */ diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index e0b43c6c52..d1735902f5 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -187,7 +187,6 @@ public: static QMetaMethod defaultMethod(const QMetaObject *); static QMetaMethod defaultMethod(QObject *); - static bool isQObject(int); static QObject *toQObject(const QVariant &, bool *ok = nullptr); static int listType(int); diff --git a/src/quick/designer/qquickdesignersupportitems.cpp b/src/quick/designer/qquickdesignersupportitems.cpp index 1797bd3ccf..987e8fd922 100644 --- a/src/quick/designer/qquickdesignersupportitems.cpp +++ b/src/quick/designer/qquickdesignersupportitems.cpp @@ -115,7 +115,7 @@ static void allSubObjects(QObject *object, QObjectList &objectList) // search recursive in property objects if (metaProperty.isReadable() && metaProperty.isWritable() - && QQmlMetaType::isQObject(metaProperty.userType())) { + && metaProperty.metaType().flags().testFlag(QMetaType::PointerToQObject)) { if (qstrcmp(metaProperty.name(), "parent")) { QObject *propertyObject = QQmlMetaType::toQObject(metaProperty.read(object)); allSubObjects(propertyObject, objectList); diff --git a/src/quick/designer/qquickdesignersupportproperties.cpp b/src/quick/designer/qquickdesignersupportproperties.cpp index bbbb8a43b4..c9b042a1ef 100644 --- a/src/quick/designer/qquickdesignersupportproperties.cpp +++ b/src/quick/designer/qquickdesignersupportproperties.cpp @@ -112,7 +112,7 @@ void QQuickDesignerSupportProperties::keepBindingFromGettingDeleted(QObject *obj bool QQuickDesignerSupportProperties::isPropertyQObject(const QMetaProperty &metaProperty) { - return QQmlMetaType::isQObject(metaProperty.userType()); + return metaProperty.metaType().flags().testFlag(QMetaType::PointerToQObject); } diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index e5da5c59aa..9ee6db39da 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -157,7 +157,7 @@ void collectReachableMetaObjects(QObject *object, QSet *met for (int index = 0; index < meta->propertyCount(); ++index) { QMetaProperty prop = meta->property(index); - if (QQmlMetaType::isQObject(prop.userType())) { + if (prop.metaType().flags().testFlag(QMetaType::PointerToQObject)) { if (verbose) std::cerr << " Processing property " << qPrintable( prop.name() ) << std::endl; currentProperty = QString("%1::%2").arg(meta->className(), prop.name());