Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	configure
	src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
	src/network/access/qnetworkaccessmanager.cpp
	src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
	src/widgets/widgets/qlineedit_p.cpp
	src/widgets/widgets/qlineedit_p.h
	src/winmain/winmain.pro
	tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
	tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
	tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt
	tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
	tools/configure/configureapp.cpp

Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a

1 files changed, 24 insertions, 35 deletions

diff --git a/src/plugins/bearer/nativewifi/main.cpp b/src/plugins/bearer/nativewifi/main.cpp
index 84320bfe14..826c0104e4 100644
--- a/src/plugins/bearer/nativewifi/main.cpp
+++ b/src/plugins/bearer/nativewifi/main.cpp
@@ -41,7 +41,6 @@
 #include "platformdefs.h"
 
 #include <QtCore/qmutex.h>
-#include <QtCore/private/qmutexpool_p.h>
 #include <QtCore/qlibrary.h>
 
 #include <QtNetwork/private/qbearerplugin_p.h>
@@ -52,42 +51,32 @@
 
 QT_BEGIN_NAMESPACE
 
-static void resolveLibrary()
+static bool resolveLibraryInternal()
 {
-    static QBasicAtomicInt triedResolve = Q_BASIC_ATOMIC_INITIALIZER(false);
-
-    if (!triedResolve.loadAcquire()) {
-#ifndef QT_NO_THREAD
-        QMutexLocker locker(QMutexPool::globalInstanceGet(&local_WlanOpenHandle));
-#endif
-
-        if (!triedResolve.load()) {
-            QLibrary wlanapiLib(QLatin1String("wlanapi"));
-            local_WlanOpenHandle = (WlanOpenHandleProto)
-                wlanapiLib.resolve("WlanOpenHandle");
-            local_WlanRegisterNotification = (WlanRegisterNotificationProto)
-                wlanapiLib.resolve("WlanRegisterNotification");
-            local_WlanEnumInterfaces = (WlanEnumInterfacesProto)
-                wlanapiLib.resolve("WlanEnumInterfaces");
-            local_WlanGetAvailableNetworkList = (WlanGetAvailableNetworkListProto)
-                wlanapiLib.resolve("WlanGetAvailableNetworkList");
-            local_WlanQueryInterface = (WlanQueryInterfaceProto)
-                wlanapiLib.resolve("WlanQueryInterface");
-            local_WlanConnect = (WlanConnectProto)
-                wlanapiLib.resolve("WlanConnect");
-            local_WlanDisconnect = (WlanDisconnectProto)
-                wlanapiLib.resolve("WlanDisconnect");
-            local_WlanScan = (WlanScanProto)
-                wlanapiLib.resolve("WlanScan");
-            local_WlanFreeMemory = (WlanFreeMemoryProto)
-                wlanapiLib.resolve("WlanFreeMemory");
-            local_WlanCloseHandle = (WlanCloseHandleProto)
-                wlanapiLib.resolve("WlanCloseHandle");
-
-            triedResolve.storeRelease(true);
-        }
-    }
+    QLibrary wlanapiLib(QLatin1String("wlanapi"));
+    local_WlanOpenHandle = (WlanOpenHandleProto)
+                           wlanapiLib.resolve("WlanOpenHandle");
+    local_WlanRegisterNotification = (WlanRegisterNotificationProto)
+                                     wlanapiLib.resolve("WlanRegisterNotification");
+    local_WlanEnumInterfaces = (WlanEnumInterfacesProto)
+                               wlanapiLib.resolve("WlanEnumInterfaces");
+    local_WlanGetAvailableNetworkList = (WlanGetAvailableNetworkListProto)
+                                        wlanapiLib.resolve("WlanGetAvailableNetworkList");
+    local_WlanQueryInterface = (WlanQueryInterfaceProto)
+                               wlanapiLib.resolve("WlanQueryInterface");
+    local_WlanConnect = (WlanConnectProto)
+                        wlanapiLib.resolve("WlanConnect");
+    local_WlanDisconnect = (WlanDisconnectProto)
+                           wlanapiLib.resolve("WlanDisconnect");
+    local_WlanScan = (WlanScanProto)
+                     wlanapiLib.resolve("WlanScan");
+    local_WlanFreeMemory = (WlanFreeMemoryProto)
+                           wlanapiLib.resolve("WlanFreeMemory");
+    local_WlanCloseHandle = (WlanCloseHandleProto)
+                            wlanapiLib.resolve("WlanCloseHandle");
+    return true;
 }
+Q_GLOBAL_STATIC_WITH_ARGS(bool, resolveLibrary, (resolveLibraryInternal()))
 
 class QNativeWifiEnginePlugin : public QBearerEnginePlugin
 {