diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 13:56:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 13:56:41 (GMT) |
| commit | 5a438bd30cf7d92309cbff51da523b7faea335f5 (patch) | |
| tree | f875e79dd2c7b7a4db289a9a5e2f91da67b21298 /src/network | |
| parent | 721b836cb05e56c471afda88cce05009f0116df1 (diff) | |
| parent | 8229eded4cba85ae53c1b03ce87981ebabd2f3ae (diff) | |
| download | Qt-5a438bd30cf7d92309cbff51da523b7faea335f5.zip Qt-5a438bd30cf7d92309cbff51da523b7faea335f5.tar.gz Qt-5a438bd30cf7d92309cbff51da523b7faea335f5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix regression with SSL connections failing on symbian
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index b4d030c..aea04a3 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -750,7 +750,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates() ptrCertCloseStore(hSystemStore, 0); } } -#elif defined(Q_OS_UNIX) +#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) systemCerts.append(QSslCertificate::fromPath(QLatin1String("/var/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // AIX systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Solaris systemCerts.append(QSslCertificate::fromPath(QLatin1String("/opt/openssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // HP-UX |