Clean up (QQmlEnginePrivate|QQmlMetaType)::toQObject

All the necessary information is contained in the QVariant's metatype,
so we can use that. This removes the need to acquire the data pointer
lock. The method in QQmlEnginePrivate now simply forwards to
QQmlMetaType; in a later commit, all usages of the forwarding functions
from QQmlEnginePrivate will be replaced with the equivalents from
QQmlMetaType, so that they can be removed from QQmlEnginePrivate.

Task-number: QTBUG-88766
Change-Id: Iebcda9b18b4952fff2c7c1aeae210c677c6869b8
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index 9dea173127..f3035209ce 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -1088,7 +1088,7 @@ QList<QQmlPrivate::AutoParentFunction> QQmlMetaType::parentFunctions()
 
 QObject *QQmlMetaType::toQObject(const QVariant &v, bool *ok)
 {
-    if (!isQObject(v.userType())) {
+    if (!v.metaType().flags().testFlag(QMetaType::PointerToQObject)) {
         if (ok) *ok = false;
         return nullptr;
     }