File libqt4-4.8.4-fix_loading_openssl.diff of Package mingw32-libqt4-opensource-4.8.6

Overview Repositories Revisions Requests Users Attributes Meta

File libqt4-4.8.4-fix_loading_openssl.diff of Package mingw32-libqt4-opensource-4.8.6 (Revision 6a8eb871f91945bfe722b22166cb289f)

Currently displaying revision 6a8eb871f91945bfe722b22166cb289f , Show latest

diff -urN src.orig/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
--- src.orig/network/ssl/qsslsocket_openssl_symbols.cpp	2013-01-29 20:03:00.000000000 +0100
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp	2013-06-24 21:57:03.229625747 +0200
@@ -449,18 +449,31 @@
     pair.first = 0;
     pair.second = 0;
 
-    QSystemLibrary *ssleay32 = new QSystemLibrary(QLatin1String("ssleay32"));
+    QSystemLibrary *ssleay32 = new QSystemLibrary(QLatin1String("libssl-OPENSSL_SONAME"));
     if (!ssleay32->load(false)) {
-        // Cannot find ssleay32.dll
+        // Cannot find libssl-OPENSSL_SONAME.dll
+        // in our cross-build that's the same as ssleay32.dll
         delete ssleay32;
-        return pair;
+        ssleay32 = new QSystemLibrary(QLatin1String("ssleay32"));
+        if (!ssleay32->load(false)) {
+            // Cannot find ssleay32.dll
+            delete ssleay32;
+            return pair;
+        }
     }
 
-    QSystemLibrary *libeay32 = new QSystemLibrary(QLatin1String("libeay32"));
+    QSystemLibrary *libeay32 = new QSystemLibrary(QLatin1String("libcrypto-OPENSSL_SONAME"));
     if (!libeay32->load(false)) {
-        delete ssleay32;
+        // Cannot find libcrypto-OPENSSL_SONAME.dll
+        // in our cross-build that's the same as libeay32.dll
         delete libeay32;
-        return pair;
+        libeay32 = new QSystemLibrary(QLatin1String("libeay32"));
+        if (!libeay32->load(false)) {
+            // Cannot find libeay32.dll
+            delete libeay32;
+            delete ssleay32;
+            return pair;
+        }
     }
 
     pair.first = ssleay32;

Places

File libqt4-4.8.4-fix_loading_openssl.diff of Package mingw32-libqt4-opensource-4.8.6 (Revision 6a8eb871f91945bfe722b22166cb289f)

Places