diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 18:40:58 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 18:44:54 +0200 |
| commit | 2be575b4b1e6f6e11a8dbd0b1c05c003828d2598 (patch) | |
| tree | 55d2bfaff9583b3e1e9f3291f4b91f34adae1d92 /src/qml/debugger/qqmlconfigurabledebugservice_p.h | |
| parent | 4a5939d26d1e36efdb2b30cdee1f3672587c3fa5 (diff) | |
| parent | 9e32b23a1514f367921b4a9ee25bc864a008463c (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I6f2152aeecaeb8e63fdbc1cdf1444132a054b6f5
Diffstat (limited to 'src/qml/debugger/qqmlconfigurabledebugservice_p.h')
| -rw-r--r-- | src/qml/debugger/qqmlconfigurabledebugservice_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/debugger/qqmlconfigurabledebugservice_p.h b/src/qml/debugger/qqmlconfigurabledebugservice_p.h index 96ec46f475..38f41047c0 100644 --- a/src/qml/debugger/qqmlconfigurabledebugservice_p.h +++ b/src/qml/debugger/qqmlconfigurabledebugservice_p.h @@ -64,7 +64,7 @@ class QQmlConfigurableDebugService : public Base { protected: QQmlConfigurableDebugService(float version, QObject *parent = nullptr) : - Base(version, parent), m_configMutex(QMutex::Recursive) + Base(version, parent) { init(); } @@ -103,7 +103,7 @@ protected: emit Base::attachedToEngine(engine); } - QMutex m_configMutex; + QRecursiveMutex m_configMutex; QList<QJSEngine *> m_waitingEngines; bool m_waitingForConfiguration; }; |