diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2014-03-05 14:25:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-06 12:21:14 +0100 |
| commit | 7aa1a7f1c1fc4feaeb27c08ef7080064fef8dfb3 (patch) | |
| tree | 7c55560b2c910ef3948c86f344ee00938ca74e1b /tests | |
| parent | 62742d037f20455e8acbe3bcd6542a484da3776f (diff) | |
spdy autotest: Fixed build with QT_NO_NETWORKPROXY
Task-number: QTBUG-37171
Change-Id: I835764978cf75592d46a20fa5f644f6accec43f5
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/network/access/spdy/tst_spdy.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/network/access/spdy/tst_spdy.cpp b/tests/auto/network/access/spdy/tst_spdy.cpp index 50c4347a9d..3f69549bbd 100644 --- a/tests/auto/network/access/spdy/tst_spdy.cpp +++ b/tests/auto/network/access/spdy/tst_spdy.cpp @@ -67,13 +67,17 @@ private Q_SLOTS: void initTestCase(); void settingsAndNegotiation_data(); void settingsAndNegotiation(); +#ifndef QT_NO_NETWORKPROXY void download_data(); void download(); +#endif // !QT_NO_NETWORKPROXY void headerFields(); +#ifndef QT_NO_NETWORKPROXY void upload_data(); void upload(); void errors_data(); void errors(); +#endif // !QT_NO_NETWORKPROXY void multipleRequests_data(); void multipleRequests(); @@ -202,6 +206,7 @@ void tst_Spdy::proxyAuthenticationRequired(const QNetworkProxy &/*proxy*/, authenticator->setPassword("password"); } +#ifndef QT_NO_NETWORKPROXY void tst_Spdy::download_data() { QTest::addColumn<QUrl>("url"); @@ -299,6 +304,7 @@ void tst_Spdy::download() reply->deleteLater(); m_manager.setProxy(QNetworkProxy()); // reset } +#endif // !QT_NO_NETWORKPROXY void tst_Spdy::headerFields() { @@ -329,6 +335,7 @@ static inline QByteArray md5sum(const QByteArray &data) return QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex().append('\n'); } +#ifndef QT_NO_NETWORKPROXY void tst_Spdy::upload_data() { QTest::addColumn<QUrl>("url"); @@ -602,6 +609,7 @@ void tst_Spdy::errors() this, SLOT(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)), Qt::UniqueConnection); // reset } +#endif // !QT_NO_NETWORKPROXY void tst_Spdy::multipleRequests_data() { |