diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-05 08:58:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-05 08:58:25 +0200 |
| commit | f3a1048b61881f3e464112a33a5afa08e58ed0c3 (patch) | |
| tree | 24063324465516ed4490db9dd2ee0fa166b3e66d /src/dbus/qdbus_symbols.cpp | |
| parent | e82a1d6b2998b30fc100c4ebf9b98ee18dd3c374 (diff) | |
| parent | 46ec24d2b9a0fb1d59955f11dab0ead05dd017f9 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I065e212f0dc115efa1ffcb14cf9f679259da6b79
Diffstat (limited to 'src/dbus/qdbus_symbols.cpp')
| -rw-r--r-- | src/dbus/qdbus_symbols.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp index f22696639d..284ba999c2 100644 --- a/src/dbus/qdbus_symbols.cpp +++ b/src/dbus/qdbus_symbols.cpp @@ -41,6 +41,7 @@ #include <QtCore/qglobal.h> #if QT_CONFIG(library) #include <QtCore/qlibrary.h> +#include <QtCore/private/qlocking_p.h> #endif #include <QtCore/qmutex.h> @@ -80,7 +81,7 @@ bool qdbus_loadLibDBus() static bool triedToLoadLibrary = false; static QBasicMutex mutex; - QMutexLocker locker(&mutex); + const auto locker = qt_scoped_lock(mutex); QLibrary *&lib = qdbus_libdbus; if (triedToLoadLibrary) |