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.cpp | |
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.cpp')
-rw-r--r-- | src/network/access/qhttpthreaddelegate.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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()); |