diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-08-10 13:02:52 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-11 08:42:08 (GMT) |
| commit | 3a44730b2d2d9b481c5af6ce1e1b6664e6655220 (patch) | |
| tree | 12a7dfcd989ca08f0108e073171128a6a02cf45c | |
| parent | b5ab5d8c59b1cfbf762ea584af65ec776f9f1b95 (diff) | |
| download | Qt-3a44730b2d2d9b481c5af6ce1e1b6664e6655220.zip Qt-3a44730b2d2d9b481c5af6ce1e1b6664e6655220.tar.gz Qt-3a44730b2d2d9b481c5af6ce1e1b6664e6655220.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
(cherry picked from commit 8229eded4cba85ae53c1b03ce87981ebabd2f3ae)
| -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 2fd9901..6a4613e 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -744,7 +744,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 |