diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-09-04 20:39:14 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-09-05 12:20:02 +0200 |
| commit | 7b1dad80212b886424d43c8f94fb92962510fe7f (patch) | |
| tree | cfe482f1c00f7aae620e928035b4367992cdd495 /tests | |
| parent | 585cef5f901c5860d8f6dce3cd49dcddb7a8481a (diff) | |
ssl: enable non-OpenSSL backends to compile QSslSocket tests
Some of the QSslSocket tests use OpenSSL-specific symbols. This
change fixes this issue.
Change-Id: Ib67efa42a15facaf0ad34fc0466341a37d945d1e
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 33cee37b92..c2f004f756 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -138,7 +138,9 @@ private slots: void peerCertificate(); void peerCertificateChain(); void privateKey(); +#ifndef QT_NO_OPENSSL void privateKeyOpaque(); +#endif void protocol(); void protocolServerSide_data(); void protocolServerSide(); @@ -186,7 +188,9 @@ private slots: void writeBigChunk(); void blacklistedCertificates(); void versionAccessors(); +#ifndef QT_NO_OPENSSL void sslOptions(); +#endif void encryptWithoutConnecting(); void resume_data(); void resume(); @@ -810,6 +814,7 @@ void tst_QSslSocket::privateKey() { } +#ifndef QT_NO_OPENSSL void tst_QSslSocket::privateKeyOpaque() { if (!QSslSocket::supportsSsl()) @@ -839,6 +844,7 @@ void tst_QSslSocket::privateKeyOpaque() if (setProxy && !socket->waitForEncrypted(10000)) QSKIP("Skipping flaky test - See QTBUG-29941"); } +#endif void tst_QSslSocket::protocol() { @@ -2280,6 +2286,7 @@ void tst_QSslSocket::versionAccessors() qDebug() << QString::number(QSslSocket::sslLibraryVersionNumber(), 16); } +#ifndef QT_NO_OPENSSL void tst_QSslSocket::sslOptions() { if (!QSslSocket::supportsSsl()) @@ -2331,6 +2338,7 @@ void tst_QSslSocket::sslOptions() #endif #endif } +#endif void tst_QSslSocket::encryptWithoutConnecting() { |