summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-02-20 16:40:55 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-07 04:09:17 (GMT)
commitc75f9e83b9a83d4d53e4c2d21d294bca0bbc1c62 (patch)
tree65964da47dfebdb7fcd8303507e609fb3e117211 /tests
parent92b1f5479b822a15f0c16f7da9219875a4df5b89 (diff)
downloadQt-c75f9e83b9a83d4d53e4c2d21d294bca0bbc1c62.zip
Qt-c75f9e83b9a83d4d53e4c2d21d294bca0bbc1c62.tar.gz
Qt-c75f9e83b9a83d4d53e4c2d21d294bca0bbc1c62.tar.bz2
Make qget manual test compile without ssl support
Change-Id: I35f92328b79df1cfcae52fa6ff8290f260183aea Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 3fe79f23a97323521eb0182f8b46b0d0fc9ce44b)
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/qnetworkaccessmanager/qget/qget.cpp4
-rw-r--r--tests/manual/qnetworkaccessmanager/qget/qget.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.cpp b/tests/manual/qnetworkaccessmanager/qget/qget.cpp
index 4e1bc4a..04067d6 100644
--- a/tests/manual/qnetworkaccessmanager/qget/qget.cpp
+++ b/tests/manual/qnetworkaccessmanager/qget/qget.cpp
@@ -57,7 +57,9 @@ DownloadManager::DownloadManager()
connect(&nam, SIGNAL(finished(QNetworkReply*)), this, SLOT(finished(QNetworkReply*)));
connect(&nam, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), this, SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*)));
connect(&nam, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)), this, SLOT(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
+#ifndef QT_NO_SSL
connect(&nam, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)), this, SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&)));
+#endif
}
DownloadManager::~DownloadManager()
@@ -117,6 +119,7 @@ void DownloadManager::proxyAuthenticationRequired(const QNetworkProxy& proxy, QA
}
}
+#ifndef QT_NO_SSL
void DownloadManager::sslErrors(QNetworkReply* reply, const QList<QSslError>& errors)
{
qDebug() << "sslErrors";
@@ -125,6 +128,7 @@ void DownloadManager::sslErrors(QNetworkReply* reply, const QList<QSslError>& er
qDebug() << error.certificate().toPem();
}
}
+#endif
DownloadItem::DownloadItem(QNetworkReply* r, QNetworkAccessManager& manager) : reply(r), nam(manager)
{
diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.h b/tests/manual/qnetworkaccessmanager/qget/qget.h
index f66e3cd..6d1e7a5 100644
--- a/tests/manual/qnetworkaccessmanager/qget/qget.h
+++ b/tests/manual/qnetworkaccessmanager/qget/qget.h
@@ -87,7 +87,9 @@ private slots:
void finished(QNetworkReply* reply);
void authenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator);
void proxyAuthenticationRequired(const QNetworkProxy& proxy, QAuthenticator* authenticator);
+#ifndef QT_NO_SSL
void sslErrors(QNetworkReply* reply, const QList<QSslError>& errors);
+#endif
void downloadFinished(DownloadItem *item);
private:
QNetworkAccessManager nam;