From e913b690b9c87a24e69085f707886ee066d1b616 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 22 Aug 2019 10:17:12 +0200
Subject: QtDBus: port all QMutexLocker users to qt_{scoped,unique}_lock

Change-Id: Ibba27351a81b0b132ce702c1dfd49d56f23bd8c1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/dbus/qdbusserver.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/dbus/qdbusserver.cpp')

diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
index 2899fb7bea..f2607e3e8d 100644
--- a/src/dbus/qdbusserver.cpp
+++ b/src/dbus/qdbusserver.cpp
@@ -43,6 +43,8 @@
 #include "qdbusconnectionmanager_p.h"
 #include "qdbusutil_p.h"
 
+#include <QtCore/private/qlocking_p.h>
+
 #ifndef QT_NO_DBUS
 
 QT_BEGIN_NAMESPACE
@@ -111,7 +113,7 @@ QDBusServer::~QDBusServer()
 {
     QWriteLocker locker(&d->lock);
     if (QDBusConnectionManager::instance()) {
-        QMutexLocker locker(&QDBusConnectionManager::instance()->mutex);
+        const auto locker = qt_scoped_lock(QDBusConnectionManager::instance()->mutex);
         for (const QString &name : qAsConst(d->serverConnectionNames))
             QDBusConnectionManager::instance()->removeConnection(name);
         d->serverConnectionNames.clear();
-- 
cgit v1.2.3