Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/plugins/platforms/android/androidjniaccessibility.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp

Manually adjusted:
	mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
	to include 9ce697f2d54be6d94381c72af28dda79cbc027d4

Thanks goes to Sergio for the qnx mkspecs adjustments.

Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e

1 files changed, 26 insertions, 9 deletions

diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 9736950c89..50281b632a 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -359,7 +359,7 @@ class QLibraryStore
 {
 public:
     inline ~QLibraryStore();
-    static inline QLibraryPrivate *findOrCreate(const QString &fileName, const QString &version);
+    static inline QLibraryPrivate *findOrCreate(const QString &fileName, const QString &version, QLibrary::LoadHints loadHints);
     static inline void releaseLibrary(QLibraryPrivate *lib);
 
     static inline void cleanup();
@@ -438,17 +438,21 @@ QLibraryStore *QLibraryStore::instance()
     return qt_library_data;
 }
 
-inline QLibraryPrivate *QLibraryStore::findOrCreate(const QString &fileName, const QString &version)
+inline QLibraryPrivate *QLibraryStore::findOrCreate(const QString &fileName, const QString &version,
+                                                    QLibrary::LoadHints loadHints)
 {
     QMutexLocker locker(&qt_library_mutex);
     QLibraryStore *data = instance();
 
     // check if this library is already loaded
     QLibraryPrivate *lib = 0;
-    if (Q_LIKELY(data))
+    if (Q_LIKELY(data)) {
         lib = data->libraryMap.value(fileName);
+        if (lib)
+            lib->mergeLoadHints(loadHints);
+    }
     if (!lib)
-        lib = new QLibraryPrivate(fileName, version);
+        lib = new QLibraryPrivate(fileName, version, loadHints);
 
     // track this library
     if (Q_LIKELY(data))
@@ -479,21 +483,34 @@ inline void QLibraryStore::releaseLibrary(QLibraryPrivate *lib)
     delete lib;
 }
 
-QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString &version)
+QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString &version, QLibrary::LoadHints loadHints)
     : pHnd(0), fileName(canonicalFileName), fullVersion(version), instance(0),
-      loadHints(0),
+      loadHints(loadHints),
       libraryRefCount(0), libraryUnloadCount(0), pluginState(MightBeAPlugin)
-{ }
+{
+    if (canonicalFileName.isEmpty())
+        errorString = QLibrary::tr("The shared library was not found.");
+}
 
-QLibraryPrivate *QLibraryPrivate::findOrCreate(const QString &fileName, const QString &version)
+QLibraryPrivate *QLibraryPrivate::findOrCreate(const QString &fileName, const QString &version,
+                                               QLibrary::LoadHints loadHints)
 {
-    return QLibraryStore::findOrCreate(fileName, version);
+    return QLibraryStore::findOrCreate(fileName, version, loadHints);
 }
 
 QLibraryPrivate::~QLibraryPrivate()
 {
 }
 
+void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh)
+{
+    // if the library is already loaded, we can't change the load hints
+    if (pHnd)
+        return;
+
+    loadHints = lh;
+}
+
 QFunctionPointer QLibraryPrivate::resolve(const char *symbol)
 {
     if (!pHnd)