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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/network/download/main.cpp | 2 | ||||
| -rw-r--r-- | examples/network/http/httpwindow.cpp | 6 | ||||
| -rw-r--r-- | examples/network/http/httpwindow.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/network/download/main.cpp b/examples/network/download/main.cpp index aea42a540c..ae3aa1f78b 100644 --- a/examples/network/download/main.cpp +++ b/examples/network/download/main.cpp @@ -151,7 +151,7 @@ void DownloadManager::execute() void DownloadManager::sslErrors(const QList<QSslError> &sslErrors) { -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL foreach (const QSslError &error, sslErrors) fprintf(stderr, "SSL error: %s\n", qPrintable(error.errorString())); #endif diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp index 2f5f739853..c56a6fa53f 100644 --- a/examples/network/http/httpwindow.cpp +++ b/examples/network/http/httpwindow.cpp @@ -47,7 +47,7 @@ HttpWindow::HttpWindow(QWidget *parent) : QDialog(parent) { -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL urlLineEdit = new QLineEdit("https://qt.nokia.com/"); #else urlLineEdit = new QLineEdit("http://qt.nokia.com/"); @@ -75,7 +75,7 @@ HttpWindow::HttpWindow(QWidget *parent) connect(&qnam, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), this, SLOT(slotAuthenticationRequired(QNetworkReply*,QAuthenticator*))); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL connect(&qnam, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)), this, SLOT(sslErrors(QNetworkReply*,QList<QSslError>))); #endif @@ -247,7 +247,7 @@ void HttpWindow::slotAuthenticationRequired(QNetworkReply*,QAuthenticator *authe } } -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void HttpWindow::sslErrors(QNetworkReply*,const QList<QSslError> &errors) { QString errorString; diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h index 54587b2f6d..a3694ddcbe 100644 --- a/examples/network/http/httpwindow.h +++ b/examples/network/http/httpwindow.h @@ -76,7 +76,7 @@ private slots: void updateDataReadProgress(qint64 bytesRead, qint64 totalBytes); void enableDownloadButton(); void slotAuthenticationRequired(QNetworkReply*,QAuthenticator *); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void sslErrors(QNetworkReply*,const QList<QSslError> &errors); #endif |