diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-08-10 13:02:52 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-08-10 13:06:40 (GMT) |
| commit | 8229eded4cba85ae53c1b03ce87981ebabd2f3ae (patch) | |
| tree | fc41fe6f3a21bd02018481bd91c732232df9a8e6 /src/network | |
| parent | 4b029b2882d9dd59893807b2db72efc43792aafd (diff) | |
| download | Qt-8229eded4cba85ae53c1b03ce87981ebabd2f3ae.zip Qt-8229eded4cba85ae53c1b03ce87981ebabd2f3ae.tar.gz Qt-8229eded4cba85ae53c1b03ce87981ebabd2f3ae.tar.bz2 | |
Fix regression with SSL connections failing on symbian
Due to a wrong ifdef sequence, the unix code was being compiled instead
of the symbian code for retrieving the system certificates.
Task-number: QTBUG-12718
Reviewed-by: Peter Hartmann
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 |