diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-10-17 21:27:20 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-10-18 08:28:18 +0200 |
| commit | 7832a96b7a96fe066d653046ada9cfc292b3945f (patch) | |
| tree | 1545a7947b707d5f65228ae3df73641655598007 /src/qml/qml | |
| parent | 41469fd2e0152975a8cf27b9022b5a0d2db9a443 (diff) | |
Adapt QMutexLocker to qtbase change
Change-Id: Ica9561a42217f5a509a6e84e9e48036ec6348e48
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 961076abeb..000498b6d5 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -197,7 +197,7 @@ public: private: PathPluginMap *map; - QMutexLocker locker; + QMutexLocker<QBasicMutex> locker; }; Q_GLOBAL_STATIC(PathPluginMap, qmlPluginsByPath); // stores the uri and the PluginLoaders diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 4babafb78b..7f9696b7b3 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -113,7 +113,7 @@ public: bool isValid() const { return data != nullptr; } private: - QMutexLocker locker; + QMutexLocker<QRecursiveMutex> locker; LockedData *data = nullptr; }; |