whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Jeremy Lainé 2014-09-04 20:39:14 +02:00
parent 585cef5f90
commit 7b1dad8021
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -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()
{