From fda6324b4d471c2163c94d0c451a4bb4671b7b18 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 28 Apr 2016 18:25:52 -0700
Subject: Remove the use of QMutexPool from QtDBus loading of libdbus-1

Change-Id: Ifea6e497f11a461db432ffff1449b013c2302d38
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/dbus/qdbus_symbols.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp
index 395a436869..1b8bcbcd05 100644
--- a/src/dbus/qdbus_symbols.cpp
+++ b/src/dbus/qdbus_symbols.cpp
@@ -36,7 +36,6 @@
 #include <QtCore/qlibrary.h>
 #endif
 #include <QtCore/qmutex.h>
-#include <private/qmutexpool_p.h>
 
 #ifndef QT_NO_DBUS
 
@@ -74,8 +73,10 @@ bool qdbus_loadLibDBus()
 
     static bool triedToLoadLibrary = false;
 #ifndef QT_NO_THREAD
-    QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&qdbus_resolve_me));
+    static QBasicMutex mutex;
+    QMutexLocker locker(&mutex);
 #endif
+
     QLibrary *&lib = qdbus_libdbus;
     if (triedToLoadLibrary)
         return lib && lib->isLoaded();
-- 
cgit v1.2.3