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 /src/network/access/qnetworkreplyhttpimpl_p.h | |
| 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 'src/network/access/qnetworkreplyhttpimpl_p.h')
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index b0a8e59b94..6129d9f3b4 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -67,7 +67,7 @@ #include <private/qnetworkreply_p.h> #include <QtNetwork/QNetworkProxy> -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL #include <QtNetwork/QSslConfiguration> #endif @@ -113,7 +113,7 @@ public: Q_PRIVATE_SLOT(d_func(), void replyDownloadProgressSlot(qint64,qint64)) Q_PRIVATE_SLOT(d_func(), void httpAuthenticationRequired(const QHttpNetworkRequest &, QAuthenticator *)) Q_PRIVATE_SLOT(d_func(), void httpError(QNetworkReply::NetworkError, const QString &)) -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL Q_PRIVATE_SLOT(d_func(), void replySslErrors(const QList<QSslError> &, bool *, QList<QSslError> *)) Q_PRIVATE_SLOT(d_func(), void replySslConfigurationChanged(const QSslConfiguration&)) #endif @@ -125,7 +125,7 @@ public: Q_PRIVATE_SLOT(d_func(), void emitReplyUploadProgress(qint64, qint64)) -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL protected: void ignoreSslErrors(); void ignoreSslErrorsImplementation(const QList<QSslError> &errors); @@ -256,7 +256,7 @@ public: QSharedPointer<QAtomicInt> pendingDownloadProgressEmissions; -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL QSslConfiguration sslConfiguration; bool pendingIgnoreAllSslErrors; QList<QSslError> pendingIgnoreSslErrorsList; @@ -281,7 +281,7 @@ public: void replyDownloadProgressSlot(qint64,qint64); void httpAuthenticationRequired(const QHttpNetworkRequest &request, QAuthenticator *auth); void httpError(QNetworkReply::NetworkError error, const QString &errorString); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void replySslErrors(const QList<QSslError> &, bool *, QList<QSslError> *); void replySslConfigurationChanged(const QSslConfiguration&); #endif |