diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-16 09:41:23 +0200 |
| commit | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (patch) | |
| tree | 9a799be282e6c0d6544d9f8c872073f83e6c0475 /src/dbus/qdbusserver.cpp | |
| parent | 7e8705f6632428a8d9a937ab5fe087999347b3dd (diff) | |
| parent | f255b1e8e297e7e1363921580007145cff574e0d (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/dbus/qdbusserver.cpp')
| -rw-r--r-- | src/dbus/qdbusserver.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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(); |