simplify the code by using QSystemLibrary a bit smarter

Merge-request: 2655
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp
index 6fc5b7b..03e72c4 100644
--- a/src/network/kernel/qhostinfo_win.cpp
+++ b/src/network/kernel/qhostinfo_win.cpp
@@ -85,14 +85,15 @@ static void resolveLibrary()
     // Attempt to resolve getaddrinfo(); without it we'll have to fall
     // back to gethostbyname(), which has no IPv6 support.
 #if !defined(Q_OS_WINCE)
-    local_getaddrinfo = (getaddrinfoProto) QSystemLibrary::resolve(QLatin1String("ws2_32"), "getaddrinfo");
-    local_freeaddrinfo = (freeaddrinfoProto) QSystemLibrary::resolve(QLatin1String("ws2_32"), "freeaddrinfo");
-    local_getnameinfo = (getnameinfoProto) QSystemLibrary::resolve(QLatin1String("ws2_32"), "getnameinfo");
+    QSystemLibrary ws2lib(QLatin1String("ws2_32"));
 #else
-    local_getaddrinfo = (getaddrinfoProto) QSystemLibrary::resolve(QLatin1String("ws2"), "getaddrinfo");
-    local_freeaddrinfo = (freeaddrinfoProto) QSystemLibrary::resolve(QLatin1String("ws2"), "freeaddrinfo");
-    local_getnameinfo = (getnameinfoProto) QSystemLibrary::resolve(QLatin1String("ws2"), "getnameinfo");
+    QSystemLibrary ws2lib(QLatin1String("ws2"));
 #endif
+    if (ws2lib.load()) {
+        local_getaddrinfo = (getaddrinfoProto)ws2lib.resolve("getaddrinfo");
+        local_freeaddrinfo = (freeaddrinfoProto)ws2lib.resolve("freeaddrinfo");
+        local_getnameinfo = (getnameinfoProto)ws2lib.resolve("getnameinfo");
+    }
 }
 
 #if defined(Q_OS_WINCE)