Move registration functions from qqmlimport.cpp to qqmlmetatype.cpp

These functions require the metatype data in multiple interdependent
places. If they are executed concurrently data races are almost
guaranteed.

Move the functions to qqmlmetatype.cpp and keep the metatype mutex
locked for their duration. Access to the internals of the metatype
system also allows us to significantly simplify the logic.

Additionally we can remove methods only used by those functions from the
public interface of QQmlMetaType now.

Task-number: QTBUG-73271
Change-Id: I1279259cca5cb5be63026d5b74f5d013e7a1ac5c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 8 insertions, 7 deletions

diff --git a/src/qml/qml/qqmlmetatypedata_p.h b/src/qml/qml/qqmlmetatypedata_p.h
index 17409ed51d..cde6294c37 100644
--- a/src/qml/qml/qqmlmetatypedata_p.h
+++ b/src/qml/qml/qqmlmetatypedata_p.h
@@ -115,20 +115,21 @@ struct QQmlMetaTypeData
     QQmlPropertyCache *propertyCache(const QMetaObject *metaObject);
     QQmlPropertyCache *propertyCache(const QQmlType &type, int minorVersion);
 
-    void startRecordingTypeRegFailures(QStringList *storage)
-    { typeRegistrationFailures = storage; }
-    void stopRecordingTypeRegFailures()
-    { startRecordingTypeRegFailures(nullptr); }
+    void setTypeRegistrationFailures(QStringList *failures)
+    {
+        m_typeRegistrationFailures = failures;
+    }
+
     void recordTypeRegFailure(const QString &message)
     {
-        if (typeRegistrationFailures)
-            typeRegistrationFailures->append(message);
+        if (m_typeRegistrationFailures)
+            m_typeRegistrationFailures->append(message);
         else
             qWarning("%s", message.toUtf8().constData());
     }
 
 private:
-    QStringList *typeRegistrationFailures = nullptr;
+    QStringList *m_typeRegistrationFailures = nullptr;
 };
 
 inline uint qHash(const QQmlMetaTypeData::VersionedUri &v)