From 3f91cde588ad32277ba06d625ed36256ec65f88e Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Mon, 20 Feb 2012 17:02:41 +0000 Subject: 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 --- src/network/access/qhttpthreaddelegate_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network/access/qhttpthreaddelegate_p.h') 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 &, bool *, QList *); 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 &errors); #endif -- cgit v1.2.3