diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2011-02-16 14:36:57 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2011-02-21 10:52:15 (GMT) |
| commit | 133ca3a19d43c104b2acc67e11889aad92e78f28 (patch) | |
| tree | 40dee44a73f782b7e3e69245d8828f4a36dca10d /tests | |
| parent | f085092a48966a81315a021367086eb69c02e6a6 (diff) | |
| download | Qt-133ca3a19d43c104b2acc67e11889aad92e78f28.zip Qt-133ca3a19d43c104b2acc67e11889aad92e78f28.tar.gz Qt-133ca3a19d43c104b2acc67e11889aad92e78f28.tar.bz2 | |
tst_qnetworkreply: Fixes for building without SSL support
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 3715162..71a6e51 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -340,7 +340,9 @@ private Q_SLOTS: void synchronousRequest_data(); void synchronousRequest(); +#ifndef QT_NO_OPENSSL void synchronousRequestSslFailure(); +#endif void httpAbort(); @@ -961,7 +963,9 @@ tst_QNetworkReply::tst_QNetworkReply() qRegisterMetaType<QNetworkReply *>(); // for QSignalSpy qRegisterMetaType<QAuthenticator *>(); qRegisterMetaType<QNetworkProxy>(); +#ifndef QT_NO_OPENSSL qRegisterMetaType<QList<QSslError> >(); +#endif Q_SET_DEFAULT_IAP @@ -5485,6 +5489,7 @@ void tst_QNetworkReply::synchronousRequest() reply->deleteLater(); } +#ifndef QT_NO_OPENSSL void tst_QNetworkReply::synchronousRequestSslFailure() { // test that SSL won't be accepted with self-signed certificate, @@ -5503,6 +5508,7 @@ void tst_QNetworkReply::synchronousRequestSslFailure() QCOMPARE(reply->error(), QNetworkReply::SslHandshakeFailedError); QCOMPARE(sslErrorsSpy.count(), 0); } +#endif void tst_QNetworkReply::httpAbort() { |