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/qhttpthreaddelegate_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/qhttpthreaddelegate_p.h')
| -rw-r--r-- | src/network/access/qhttpthreaddelegate_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h index 24affdd8de..036d5b94c6 100644 --- a/src/network/access/qhttpthreaddelegate_p.h +++ b/src/network/access/qhttpthreaddelegate_p.h @@ -88,7 +88,7 @@ public: // incoming bool ssl; -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL QSslConfiguration incomingSslConfiguration; #endif QHttpNetworkRequest httpRequest; @@ -132,7 +132,7 @@ signals: #ifndef QT_NO_NETWORKPROXY void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *); #endif -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void sslErrors(const QList<QSslError> &, bool *, QList<QSslError> *); void sslConfigurationChanged(const QSslConfiguration); #endif @@ -158,7 +158,7 @@ protected slots: void synchronousHeaderChangedSlot(); void dataReadProgressSlot(qint64 done, qint64 total); void cacheCredentialsSlot(const QHttpNetworkRequest &request, QAuthenticator *authenticator); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void sslErrorsSlot(const QList<QSslError> &errors); #endif |