diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-01 13:02:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-01 13:02:02 (GMT) |
| commit | 5d95b43762a16a37a20b3288c74976f6e62075d3 (patch) | |
| tree | a8d710849a3fa96faa8854347e8e3d7f7cd1c5ba /src/network/ssl/qsslsocket_openssl_symbols.cpp | |
| parent | 33b76a659b2f44fa7038e375bbfb4cfd449ae617 (diff) | |
| parent | 8a895dbcc9aacab3b0059119650a74bbaff1a27b (diff) | |
| download | Qt-5d95b43762a16a37a20b3288c74976f6e62075d3.zip Qt-5d95b43762a16a37a20b3288c74976f6e62075d3.tar.gz Qt-5d95b43762a16a37a20b3288c74976f6e62075d3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Setting the _NET_WM_STATE Atom only when its not already set
Fix focus appearance of tabwidget tabs with QGtkStyle
Incorrect selection background for unfocused widgets with GTK
Make the OpenSSL library search also hit /lib.
Update change log.
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl_symbols.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 6affa36..d717214 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -333,7 +333,7 @@ static QStringList findAllLibSsl() paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH")) .split(QLatin1Char(':'), QString::SkipEmptyParts); # endif - paths << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib"); + paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib"); QStringList foundSsls; foreach (const QString &path, paths) { |