View | Details | Raw Unified | Return to bug 209324
Collapse All | Expand All

(-)/zbigone/src/area51/trunk/QT/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (+24 lines)
Line 0 Link Here
1
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2015-02-17 04:56:38 UTC
2
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
3
@@ -611,8 +611,8 @@ static QPair<QLibrary*, QLibrary*> loadO
4
 #endif
5
 #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
6
     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
7
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
8
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
9
+    libssl->setFileNameAndVersion(QLatin1String("/usr/local/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
10
+    libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
11
     if (libcrypto->load() && libssl->load()) {
12
         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
13
         return pair;
14
@@ -629,8 +629,8 @@ static QPair<QLibrary*, QLibrary*> loadO
15
     //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
16
     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
17
     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
18
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
19
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
20
+    libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), -1);
21
+    libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), -1);
22
     if (libcrypto->load() && libssl->load()) {
23
         // libssl.so.0 and libcrypto.so.0 found
24
         return pair;

Return to bug 209324