diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2012-07-19 13:05:27 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-27 16:07:01 (GMT) |
| commit | 94a3aa317eea37ec6300c62c9ada5d055f9ceab1 (patch) | |
| tree | d988e662c318964ec9fe22ff2ea0ab8e49496914 /src | |
| parent | 952a672c724bd5895957a433490b63ef0b0d68d2 (diff) | |
| download | Qt-94a3aa317eea37ec6300c62c9ada5d055f9ceab1.zip Qt-94a3aa317eea37ec6300c62c9ada5d055f9ceab1.tar.gz Qt-94a3aa317eea37ec6300c62c9ada5d055f9ceab1.tar.bz2 | |
Use improved QLibrary search heuristics for SSL
Change-Id: I3b6b4beedae4323cce5130fd2fcaf2a25c5be5b9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 75d47ed..f7af4ff 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -501,7 +501,9 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() #ifdef SHLIB_VERSION_NUMBER // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); + libssl->setLoadHints(QLibrary::ImprovedSearchHeuristics); libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); + libcrypto->setLoadHints(libcrypto->loadHints() | QLibrary::ImprovedSearchHeuristics); if (libcrypto->load() && libssl->load()) { // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found return pair; |