diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-06-28 10:58:17 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-31 16:10:19 +0200 |
| commit | 4bac72aa13e6818460f6b71127d3af5bd7e00ca5 (patch) | |
| tree | 840c7874d6c4ab695ed80381d9071feec7fd497b /src/qml/jsapi | |
| parent | 1d9645576eab6cc316c7772b4f4b2c05f37e6ec2 (diff) | |
Port from QMutex::Recursive to QRecursiveMutex
Change-Id: I5bf128b4479971e87d377707f2ebf267ccba1f1d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsengine_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsengine_p.h b/src/qml/jsapi/qjsengine_p.h index a77d710cff..164a70d000 100644 --- a/src/qml/jsapi/qjsengine_p.h +++ b/src/qml/jsapi/qjsengine_p.h @@ -74,7 +74,7 @@ public: static const QJSEnginePrivate* get(const QJSEngine*e) { return e->d_func(); } static QJSEnginePrivate* get(QV4::ExecutionEngine *e); - QJSEnginePrivate() : mutex(QMutex::Recursive) {} + QJSEnginePrivate() = default; ~QJSEnginePrivate() override; static void addToDebugServer(QJSEngine *q); @@ -105,7 +105,7 @@ public: }; // Shared by QQmlEngine - mutable QMutex mutex; + mutable QRecursiveMutex mutex; // These methods may be called from the QML loader thread |