From 7832a96b7a96fe066d653046ada9cfc292b3945f Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Sat, 17 Oct 2020 21:27:20 +0200
Subject: Adapt QMutexLocker to qtbase change

Change-Id: Ica9561a42217f5a509a6e84e9e48036ec6348e48
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/qml/qml/qqmlimport.cpp   | 2 +-
 src/qml/qml/qqmlmetatype.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/qml/qml')

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;
 };
 
-- 
cgit v1.2.3