summaryrefslogtreecommitdiffstats
path: root/tests/auto/qhttp
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2010-01-04 13:32:39 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2010-01-04 13:45:15 (GMT)
commita47e2de1a3958c52eef1997c448bf89d3aba63e5 (patch)
tree46f0ed077cd2a72e9ab67163c4b2e3c262e8ecce /tests/auto/qhttp
parent35cb81f92164bb136dc49b1ce7ebd76e6a79b289 (diff)
downloadQt-a47e2de1a3958c52eef1997c448bf89d3aba63e5.zip
Qt-a47e2de1a3958c52eef1997c448bf89d3aba63e5.tar.gz
Qt-a47e2de1a3958c52eef1997c448bf89d3aba63e5.tar.bz2
Remove TEST_QNETWORK_PROXY define from the tests
We always test the proxies now. Reviewed-by: Thiago
Diffstat (limited to 'tests/auto/qhttp')
-rw-r--r--tests/auto/qhttp/tst_qhttp.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp
index b4b6ceb..92ab3d8 100644
--- a/tests/auto/qhttp/tst_qhttp.cpp
+++ b/tests/auto/qhttp/tst_qhttp.cpp
@@ -57,9 +57,6 @@
# include <qsslsocket.h>
#endif
-#ifndef TEST_QNETWORK_PROXY
-#define TEST_QNETWORK_PROXY
-#endif
#include "../network-settings.h"
//TESTED_CLASS=
@@ -198,9 +195,7 @@ void tst_QHttp::initTestCase_data()
QTest::addColumn<int>("proxyType");
QTest::newRow("WithoutProxy") << false << 0;
-#ifdef TEST_QNETWORK_PROXY
QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy);
-#endif
}
void tst_QHttp::initTestCase()