Qt now really unloads plugins and libraries when exiting an app

It also means that when creating a QPluginLoader or a QLibrary for a dynamic
lib already loaded, isLoaded will return true immediately after the creation of
the instance of QPluginLoader or QLibrary.

Reviewed-By: Jan-Arve Saether

1 files changed, 5 insertions, 9 deletions

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 60fc5e1..d2ce5ff 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -206,8 +206,6 @@ static void resolveAygLibs()
     if (!aygResolved) {
         aygResolved = true;
         QLibrary ayglib(QLatin1String("aygshell"));
-        if (!ayglib.load())
-            return;
         ptrRecognizeGesture = (AygRecognizeGesture) ayglib.resolve("SHRecognizeGesture");
     }
 }
@@ -3642,13 +3640,11 @@ static void initWinTabFunctions()
         return;
 
     QLibrary library(QLatin1String("wintab32"));
-    if (library.load()) {
-        ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoW");
-        ptrWTGet = (PtrWTGet)library.resolve("WTGetW");
-        ptrWTEnable = (PtrWTEnable)library.resolve("WTEnable");
-        ptrWTOverlap = (PtrWTEnable)library.resolve("WTOverlap");
-        ptrWTPacketsGet = (PtrWTPacketsGet)library.resolve("WTPacketsGet");
-    }
+    ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoW");
+    ptrWTGet = (PtrWTGet)library.resolve("WTGetW");
+    ptrWTEnable = (PtrWTEnable)library.resolve("WTEnable");
+    ptrWTOverlap = (PtrWTEnable)library.resolve("WTOverlap");
+    ptrWTPacketsGet = (PtrWTPacketsGet)library.resolve("WTPacketsGet");
 #endif // Q_OS_WINCE
 }
 #endif // QT_NO_TABLETEVENT