diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-02-20 17:02:41 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 15:28:40 +0100 |
| commit | 3f91cde588ad32277ba06d625ed36256ec65f88e (patch) | |
| tree | 6e8a7692743cf64cd77721f466558a7180dae3a3 /tests/auto/network/access/qhttpnetworkconnection | |
| parent | 3fe79f23a97323521eb0182f8b46b0d0fc9ce44b (diff) | |
Test for QT_NO_SSL instead of QT_NO_OPENSSL
Change the ifdefs in our own code (except openssl backend) to use the
new configure flag.
Change-Id: I8774734771c66b22164b5fae8fdb27814ac3df7b
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'tests/auto/network/access/qhttpnetworkconnection')
| -rw-r--r-- | tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index 94346f726d..f9f3b26898 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -58,7 +58,7 @@ public Q_SLOTS: void finishedReply(); void finishedWithError(QNetworkReply::NetworkError errorCode, const QString &detail); void challenge401(const QHttpNetworkRequest &request, QAuthenticator *authenticator); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void sslErrors(const QList<QSslError> &errors); #endif private: @@ -92,11 +92,11 @@ private Q_SLOTS: void compression_data(); void compression(); #endif -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void ignoresslerror_data(); void ignoresslerror(); #endif -#ifdef QT_NO_OPENSSL +#ifdef QT_NO_SSL void nossl_data(); void nossl(); #endif @@ -665,7 +665,7 @@ void tst_QHttpNetworkConnection::compression() } #endif -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void tst_QHttpNetworkConnection::sslErrors(const QList<QSslError> &errors) { Q_UNUSED(errors) @@ -745,7 +745,7 @@ void tst_QHttpNetworkConnection::ignoresslerror() } #endif -#ifdef QT_NO_OPENSSL +#ifdef QT_NO_SSL Q_DECLARE_METATYPE(QNetworkReply::NetworkError) void tst_QHttpNetworkConnection::nossl_data() { |