summaryrefslogtreecommitdiffstats
path: root/tests/auto/qftp
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/qftp
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/qftp')
-rw-r--r--tests/auto/qftp/tst_qftp.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp
index 27c2e13..9c1670d 100644
--- a/tests/auto/qftp/tst_qftp.cpp
+++ b/tests/auto/qftp/tst_qftp.cpp
@@ -51,9 +51,6 @@
#include <stdlib.h>
#include <QNetworkProxy>
-#ifndef TEST_QNETWORK_PROXY
-#define TEST_QNETWORK_PROXY
-#endif
#include "../network-settings.h"
//TESTED_CLASS=
@@ -202,11 +199,9 @@ void tst_QFtp::initTestCase_data()
QTest::addColumn<int>("proxyType");
QTest::newRow("WithoutProxy") << false << 0;
-#ifdef TEST_QNETWORK_PROXY
QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy);
//### doesn't work well yet.
//QTest::newRow("WithHttpProxy") << true << int(QNetworkProxy::HttpProxy);
-#endif
}
void tst_QFtp::initTestCase()