1 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index 8f2927901a..7e43594366 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -46,7 +46,9 @@
 #include <qpa/qplatformintegration.h>
 #include <qdebug.h>
 #include "qhighdpiscaling_p.h"
+
 #include <QtCore/qscopedvaluerollback.h>
+#include <QtCore/private/qlocking_p.h>
 
 #if QT_CONFIG(draganddrop)
 #include <qpa/qplatformdrag.h>
@@ -179,7 +181,7 @@ void QWindowSystemInterfacePrivate::installWindowSystemEventHandler(QWindowSyste
 void QWindowSystemInterfacePrivate::removeWindowSystemEventhandler(QWindowSystemEventHandler *handler)
 {
     if (eventHandler == handler)
-        eventHandler = 0;
+        eventHandler = nullptr;
 }
 
 QWindowSystemEventHandler::~QWindowSystemEventHandler()
@@ -630,7 +632,7 @@ bool QWindowSystemInterface::isTouchDeviceRegistered(const QTouchDevice *device)
 static int g_nextPointId = 1;
 
 // map from device-independent point id (arbitrary) to "Qt point" ids
-QMutex QWindowSystemInterfacePrivate::pointIdMapMutex;
+static QBasicMutex pointIdMapMutex;
 typedef QMap<quint64, int> PointIdMap;
 Q_GLOBAL_STATIC(PointIdMap, g_pointIdMap)
 
@@ -648,7 +650,7 @@ Q_GLOBAL_STATIC(PointIdMap, g_pointIdMap)
 */
 static int acquireCombinedPointId(quint8 deviceId, int pointId)
 {
-    QMutexLocker locker(&QWindowSystemInterfacePrivate::pointIdMapMutex);
+    const auto locker = qt_scoped_lock(pointIdMapMutex);
 
     quint64 combinedId64 = (quint64(deviceId) << 32) + pointId;
     auto it = g_pointIdMap->constFind(combinedId64);
@@ -709,7 +711,7 @@ QList<QTouchEvent::TouchPoint>
     }
 
     if (states == Qt::TouchPointReleased) {
-        QMutexLocker locker(&QWindowSystemInterfacePrivate::pointIdMapMutex);
+        const auto locker = qt_scoped_lock(pointIdMapMutex);
 
         // All points on deviceId have been released.
         // Remove all points associated with that device from g_pointIdMap.
@@ -730,7 +732,7 @@ QList<QTouchEvent::TouchPoint>
 
 void QWindowSystemInterfacePrivate::clearPointIdMap()
 {
-    QMutexLocker locker(&QWindowSystemInterfacePrivate::pointIdMapMutex);
+    const auto locker = qt_scoped_lock(pointIdMapMutex);
     g_pointIdMap->clear();
     g_nextPointId = 1;
 }