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>

21 files changed, 65 insertions, 65 deletions

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index b49bda04ec..6aa3a5a5f4 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -57,7 +57,7 @@
 
 #ifndef QT_NO_HTTP
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 #    include <private/qsslsocket_p.h>
 #    include <QtNetwork/qsslkey.h>
 #    include <QtNetwork/qsslcipher.h>
@@ -135,7 +135,7 @@ void QHttpNetworkConnectionPrivate::pauseConnection()
 
     // Disable all socket notifiers
     for (int i = 0; i < channelCount; i++) {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         if (encrypt)
             QSslSocketPrivate::pauseSocketNotifiers(static_cast<QSslSocket*>(channels[i].socket));
         else
@@ -149,7 +149,7 @@ void QHttpNetworkConnectionPrivate::resumeConnection()
     state = RunningState;
     // Enable all socket notifiers
     for (int i = 0; i < channelCount; i++) {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         if (encrypt)
             QSslSocketPrivate::resumeSocketNotifiers(static_cast<QSslSocket*>(channels[i].socket));
         else
@@ -1181,7 +1181,7 @@ QNetworkProxy QHttpNetworkConnection::transparentProxy() const
 
 
 // SSL support below
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 void QHttpNetworkConnection::setSslConfiguration(const QSslConfiguration &config)
 {
     Q_D(QHttpNetworkConnection);
@@ -1229,7 +1229,7 @@ void QHttpNetworkConnection::ignoreSslErrors(const QList<QSslError> &errors, int
     }
 }
 
-#endif //QT_NO_OPENSSL
+#endif //QT_NO_SSL
 
 #ifndef QT_NO_NETWORKPROXY
 // only called from QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired, not
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 41ee11db51..1b9c703262 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -71,7 +71,7 @@
 
 #ifndef QT_NO_HTTP
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 #    include <QtNetwork/qsslsocket.h>
 #    include <QtNetwork/qsslerror.h>
 #else
@@ -120,7 +120,7 @@ public:
 
     QHttpNetworkConnectionChannel *channels() const;
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     void setSslConfiguration(const QSslConfiguration &config);
     void ignoreSslErrors(int channel = -1);
     void ignoreSslErrors(const QList<QSslError> &errors, int channel = -1);
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index b6b37db242..e4ea62f093 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -48,7 +48,7 @@
 
 #ifndef QT_NO_HTTP
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 #    include <QtNetwork/qsslkey.h>
 #    include <QtNetwork/qsslcipher.h>
 #    include <QtNetwork/qsslconfiguration.h>
@@ -77,7 +77,7 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
     , proxyAuthMethod(QAuthenticatorPrivate::None)
     , authenticationCredentialsSent(false)
     , proxyCredentialsSent(false)
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     , ignoreAllSslErrors(false)
 #endif
     , pipeliningSupported(PipeliningSupportUnknown)
@@ -90,7 +90,7 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
 
 void QHttpNetworkConnectionChannel::init()
 {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     if (connection->d_func()->encrypt)
         socket = new QSslSocket;
     else
@@ -139,7 +139,7 @@ void QHttpNetworkConnectionChannel::init()
                      Qt::DirectConnection);
 #endif
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
     if (sslSocket) {
         // won't be a sslSocket if encrypt is false
@@ -257,7 +257,7 @@ bool QHttpNetworkConnectionChannel::sendRequest()
         const qint64 socketWriteMaxSize = 16*1024;
 
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
         // if it is really an ssl socket, check more than just bytesToWrite()
         while ((socket->bytesToWrite() + (sslSocket ? sslSocket->encryptedBytesToWrite() : 0))
@@ -598,7 +598,7 @@ bool QHttpNetworkConnectionChannel::ensureConnection()
         }
 #endif
         if (ssl) {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
             QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
             sslSocket->connectToHostEncrypted(connectHost, connectPort, QIODevice::ReadWrite, networkLayerPreference);
             if (ignoreAllSslErrors)
@@ -1117,7 +1117,7 @@ void QHttpNetworkConnectionChannel::_q_uploadDataReadyRead()
     sendRequest();
 }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 void QHttpNetworkConnectionChannel::_q_encrypted()
 {
     if (!socket)
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 1198ec9941..7da9b514d6 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -69,7 +69,7 @@
 
 #ifndef QT_NO_HTTP
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 #    include <QtNetwork/qsslsocket.h>
 #    include <QtNetwork/qsslerror.h>
 #else
@@ -115,7 +115,7 @@ public:
     QAuthenticator proxyAuthenticator;
     bool authenticationCredentialsSent;
     bool proxyCredentialsSent;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     bool ignoreAllSslErrors;
     QList<QSslError> ignoreSslErrorsList;
 #endif
@@ -177,7 +177,7 @@ public:
 
     void _q_uploadDataReadyRead();
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     void _q_encrypted(); // start sending request (https)
     void _q_sslErrors(const QList<QSslError> &errors); // ssl errors from the socket
     void _q_encryptedBytesWritten(qint64 bytes); // proceed sending
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index 8206cfaab7..85463ee210 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -46,7 +46,7 @@
 
 #ifndef QT_NO_HTTP
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 #    include <QtNetwork/qsslkey.h>
 #    include <QtNetwork/qsslcipher.h>
 #    include <QtNetwork/qsslconfiguration.h>
@@ -834,7 +834,7 @@ void QHttpNetworkReplyPrivate::eraseData()
 
 
 // SSL support below
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 
 QSslConfiguration QHttpNetworkReply::sslConfiguration() const
 {
@@ -872,7 +872,7 @@ void QHttpNetworkReply::ignoreSslErrors(const QList<QSslError> &errors)
 }
 
 
-#endif //QT_NO_OPENSSL
+#endif //QT_NO_SSL
 
 
 QT_END_NAMESPACE
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 97400d3b15..04e4569457 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -132,7 +132,7 @@ public:
 
     QHttpNetworkConnection* connection();
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     QSslConfiguration sslConfiguration() const;
     void setSslConfiguration(const QSslConfiguration &config);
     void ignoreSslErrors();
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
index 3901635ca0..c8b4c51e23 100644
--- a/src/network/access/qhttpthreaddelegate.cpp
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -270,7 +270,7 @@ void QHttpThreadDelegate::startRequest()
 #else
         httpConnection = new QNetworkAccessCachedHttpConnection(urlCopy.host(), urlCopy.port(), ssl, networkSession);
 #endif
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         // Set the QSslConfiguration from this QNetworkRequest.
         if (ssl && incomingSslConfiguration != QSslConfiguration::defaultConfiguration()) {
             httpConnection->setSslConfiguration(incomingSslConfiguration);
@@ -312,7 +312,7 @@ void QHttpThreadDelegate::startRequest()
         // some signals are only interesting when normal asynchronous style is used
         connect(httpReply,SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
         connect(httpReply,SIGNAL(dataReadProgress(qint64, qint64)), this, SLOT(dataReadProgressSlot(qint64,qint64)));
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         connect(httpReply,SIGNAL(sslErrors(const QList<QSslError>)), this, SLOT(sslErrorsSlot(QList<QSslError>)));
 #endif
 
@@ -377,7 +377,7 @@ void QHttpThreadDelegate::finishedSlot()
         emit downloadData(httpReply->readAny());
     }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     if (ssl)
         emit sslConfigurationChanged(httpReply->sslConfiguration());
 #endif
@@ -427,7 +427,7 @@ void QHttpThreadDelegate::finishedWithErrorSlot(QNetworkReply::NetworkError erro
     qDebug() << "QHttpThreadDelegate::finishedWithErrorSlot() thread=" << QThread::currentThreadId() << "error=" << errorCode << detail;
 #endif
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     if (ssl)
         emit sslConfigurationChanged(httpReply->sslConfiguration());
 #endif
@@ -465,7 +465,7 @@ void QHttpThreadDelegate::headerChangedSlot()
     qDebug() << "QHttpThreadDelegate::headerChangedSlot() thread=" << QThread::currentThreadId();
 #endif
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     if (ssl)
         emit sslConfigurationChanged(httpReply->sslConfiguration());
 #endif
@@ -530,7 +530,7 @@ void QHttpThreadDelegate::cacheCredentialsSlot(const QHttpNetworkRequest &reques
 }
 
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 void QHttpThreadDelegate::sslErrorsSlot(const QList<QSslError> &errors)
 {
     emit sslConfigurationChanged(httpReply->sslConfiguration());
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
 
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index d7b6b78e22..f99869621f 100644
--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@@ -342,7 +342,7 @@ void QNetworkAccessBackend::redirectionRequested(const QUrl &target)
 
 void QNetworkAccessBackend::sslErrors(const QList<QSslError> &errors)
 {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     reply->sslErrors(errors);
 #else
     Q_UNUSED(errors);
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index a5a73e6e95..740e54b833 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -353,7 +353,7 @@ QNetworkAccessManager::QNetworkAccessManager(QObject *parent)
 #ifndef QT_NO_NETWORKPROXY
     qRegisterMetaType<QNetworkProxy>("QNetworkProxy");
 #endif
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     qRegisterMetaType<QList<QSslError> >("QList<QSslError>");
     qRegisterMetaType<QSslConfiguration>("QSslConfiguration");
 #endif
@@ -1011,7 +1011,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
         priv->backend->reply = priv;
     }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     reply->setSslConfiguration(request.sslConfiguration());
 #endif
 
@@ -1051,7 +1051,7 @@ void QNetworkAccessManagerPrivate::_q_replyFinished()
 
 void QNetworkAccessManagerPrivate::_q_replySslErrors(const QList<QSslError> &errors)
 {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     Q_Q(QNetworkAccessManager);
     QNetworkReply *reply = qobject_cast<QNetworkReply *>(q->sender());
     if (reply)
@@ -1066,7 +1066,7 @@ QNetworkReply *QNetworkAccessManagerPrivate::postProcess(QNetworkReply *reply)
     Q_Q(QNetworkAccessManager);
     QNetworkReplyPrivate::setManager(reply, q);
     q->connect(reply, SIGNAL(finished()), SLOT(_q_replyFinished()));
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     /* In case we're compiled without SSL support, we don't have this signal and we need to
      * avoid getting a connection error. */
     q->connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SLOT(_q_replySslErrors(QList<QSslError>)));
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index fdbcf01dad..4d23fcbcdc 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -140,7 +140,7 @@ Q_SIGNALS:
 #endif
     void authenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator);
     void finished(QNetworkReply *reply);
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     void sslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
 #endif
 
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index 123418dbcd..ac38f2efec 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -573,7 +573,7 @@ QVariant QNetworkReply::attribute(QNetworkRequest::Attribute code) const
     return d_func()->attributes.value(code);
 }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 /*!
     Returns the SSL configuration and state associated with this
     reply, if SSL was used. It will contain the remote server's
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index 89ccc2fb92..b8d606c260 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -134,7 +134,7 @@ public:
     // attributes
     QVariant attribute(QNetworkRequest::Attribute code) const;
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     QSslConfiguration sslConfiguration() const;
     void setSslConfiguration(const QSslConfiguration &configuration);
     void ignoreSslErrors(const QList<QSslError> &errors);
@@ -147,7 +147,7 @@ Q_SIGNALS:
     void metaDataChanged();
     void finished();
     void error(QNetworkReply::NetworkError);
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     void sslErrors(const QList<QSslError> &errors);
 #endif
 
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 71bc03e8d0..a4413cda95 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -179,7 +179,7 @@ QNetworkReplyHttpImpl::QNetworkReplyHttpImpl(QNetworkAccessManager* const manage
     d->operation = operation;
     d->outgoingData = outgoingData;
     d->url = request.url();
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     d->sslConfiguration = request.sslConfiguration();
 #endif
 
@@ -387,7 +387,7 @@ bool QNetworkReplyHttpImpl::canReadLine () const
     return d->downloadMultiBuffer.canReadLine();
 }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 void QNetworkReplyHttpImpl::ignoreSslErrors()
 {
     Q_D(QNetworkReplyHttpImpl);
@@ -441,7 +441,7 @@ QNetworkReplyHttpImplPrivate::QNetworkReplyHttpImplPrivate()
     , downloadZerocopyBuffer(0)
     , pendingDownloadDataEmissions(new QAtomicInt())
     , pendingDownloadProgressEmissions(new QAtomicInt())
-    #ifndef QT_NO_OPENSSL
+    #ifndef QT_NO_SSL
     , pendingIgnoreAllSslErrors(false)
     #endif
 
@@ -764,7 +764,7 @@ void QNetworkReplyHttpImplPrivate::postRequest()
     delegate->transparentProxy = transparentProxy;
 #endif
     delegate->ssl = ssl;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     if (ssl)
         delegate->incomingSslConfiguration = request.sslConfiguration();
 #endif
@@ -809,7 +809,7 @@ void QNetworkReplyHttpImplPrivate::postRequest()
         QObject::connect(delegate, SIGNAL(error(QNetworkReply::NetworkError,QString)),
                 q, SLOT(httpError(QNetworkReply::NetworkError, const QString)),
                 Qt::QueuedConnection);
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         QObject::connect(delegate, SIGNAL(sslConfigurationChanged(QSslConfiguration)),
                 q, SLOT(replySslConfigurationChanged(QSslConfiguration)),
                 Qt::QueuedConnection);
@@ -823,7 +823,7 @@ void QNetworkReplyHttpImplPrivate::postRequest()
                  q, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
                  Qt::BlockingQueuedConnection);
 #endif
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         QObject::connect(delegate, SIGNAL(sslErrors(QList<QSslError>,bool*,QList<QSslError>*)),
                 q, SLOT(replySslErrors(const QList<QSslError> &, bool *, QList<QSslError> *)),
                 Qt::BlockingQueuedConnection);
@@ -1202,7 +1202,7 @@ void QNetworkReplyHttpImplPrivate::httpError(QNetworkReply::NetworkError errorCo
     error(errorCode, errorString);
 }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 void QNetworkReplyHttpImplPrivate::replySslErrors(
         const QList<QSslError> &list, bool *ignoreAll, QList<QSslError> *toBeIgnored)
 {
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
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index f97d98ec5a..c0b8acc581 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -819,7 +819,7 @@ void QNetworkReplyImplPrivate::redirectionRequested(const QUrl &target)
 
 void QNetworkReplyImplPrivate::sslErrors(const QList<QSslError> &errors)
 {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     Q_Q(QNetworkReplyImpl);
     emit q->sslErrors(errors);
 #else
@@ -930,7 +930,7 @@ void QNetworkReplyImpl::setReadBufferSize(qint64 size)
         d->backend->setDownstreamLimited(d->readBufferMaxSize > 0);
 }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 void QNetworkReplyImpl::sslConfigurationImplementation(QSslConfiguration &configuration) const
 {
     Q_D(const QNetworkReplyImpl);
@@ -958,7 +958,7 @@ void QNetworkReplyImpl::ignoreSslErrorsImplementation(const QList<QSslError> &er
     if (d->backend)
         d->backend->ignoreSslErrors(errors);
 }
-#endif  // QT_NO_OPENSSL
+#endif  // QT_NO_SSL
 
 /*!
     \internal
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h
index 39c3b9ca2e..601e99f5fa 100644
--- a/src/network/access/qnetworkreplyimpl_p.h
+++ b/src/network/access/qnetworkreplyimpl_p.h
@@ -98,7 +98,7 @@ public:
     Q_PRIVATE_SLOT(d_func(), void _q_networkSessionFailed())
 #endif
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 protected:
     void sslConfigurationImplementation(QSslConfiguration &configuration) const;
     void setSslConfigurationImplementation(const QSslConfiguration &configuration);
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index ef81b6081d..f94337eaeb 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -289,13 +289,13 @@ class QNetworkRequestPrivate: public QSharedData, public QNetworkHeadersPrivate
 public:
     inline QNetworkRequestPrivate()
         : priority(QNetworkRequest::NormalPriority)
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         , sslConfiguration(0)
 #endif
     { qRegisterMetaType<QNetworkRequest>(); }
     ~QNetworkRequestPrivate()
     {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         delete sslConfiguration;
 #endif
     }
@@ -307,7 +307,7 @@ public:
         url = other.url;
         priority = other.priority;
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         sslConfiguration = 0;
         if (other.sslConfiguration)
             sslConfiguration = new QSslConfiguration(*other.sslConfiguration);
@@ -325,7 +325,7 @@ public:
 
     QUrl url;
     QNetworkRequest::Priority priority;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     mutable QSslConfiguration *sslConfiguration;
 #endif
 };
@@ -526,7 +526,7 @@ void QNetworkRequest::setAttribute(Attribute code, const QVariant &value)
         d->attributes.remove(code);
 }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 /*!
     Returns this network request's SSL configuration. By default, no
     SSL settings are specified.
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index 1eb0fff045..7f51826d17 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -134,7 +134,7 @@ public:
     QVariant attribute(Attribute code, const QVariant &defaultValue = QVariant()) const;
     void setAttribute(Attribute code, const QVariant &value);
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     QSslConfiguration sslConfiguration() const;
     void setSslConfiguration(const QSslConfiguration &configuration);
 #endif
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 2e54a2d3ca..75e99fe223 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -457,7 +457,7 @@
 #include <qelapsedtimer.h>
 #include <qscopedvaluerollback.h>
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 #include <QtNetwork/qsslsocket.h>
 #endif
 
@@ -2244,7 +2244,7 @@ void QAbstractSocket::abort()
 #endif
     if (d->state == UnconnectedState)
         return;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     if (QSslSocket *socket = qobject_cast<QSslSocket *>(this)) {
         socket->abort();
         return;
@@ -2303,7 +2303,7 @@ bool QAbstractSocket::atEnd() const
 bool QAbstractSocket::flush()
 {
     Q_D(QAbstractSocket);
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     // Manual polymorphism; flush() isn't virtual, but QSslSocket overloads
     // it.
     if (QSslSocket *socket = qobject_cast<QSslSocket *>(this))
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index bdc9c4b4cf..aa16425e9a 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -220,7 +220,7 @@ private:
 
 QT_END_NAMESPACE
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 Q_DECLARE_METATYPE(QList<QSslError>)
 #endif