diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-02-01 14:51:15 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-02-08 09:24:43 +0000 |
| commit | 56a5103781a17a2ae0369bbd468d7103d8df6d6b (patch) | |
| tree | 8c34822bbe2c332c6b6a57e968785a21ec8bbfc2 /src/qml/qml/qml.pri | |
| parent | 92f2447cf3850303f161271c049a5b8d0a55b9f5 (diff) | |
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>
Diffstat (limited to 'src/qml/qml/qml.pri')
| -rw-r--r-- | src/qml/qml/qml.pri | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri index 9c3d4e6e26..0895e5ae68 100644 --- a/src/qml/qml/qml.pri +++ b/src/qml/qml/qml.pri @@ -15,7 +15,6 @@ SOURCES += \ $$PWD/qqmlvme.cpp \ $$PWD/qqmlboundsignal.cpp \ $$PWD/qqmlmetatype.cpp \ - $$PWD/qqmlmetatyperegistrationfailurerecorder.cpp \ $$PWD/qqmlmetatypedata.cpp \ $$PWD/qqmlstringconverters.cpp \ $$PWD/qqmltype.cpp \ @@ -78,7 +77,6 @@ HEADERS += \ $$PWD/qqmlprivate.h \ $$PWD/qqmlmetatype_p.h \ $$PWD/qqmlmetatypedata_p.h \ - $$PWD/qqmlmetatyperegistrationfailurerecorder_p.h \ $$PWD/qqmltype_p.h \ $$PWD/qqmltype_p_p.h \ $$PWD/qqmltypemodule_p.h \ |