diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-25 06:19:34 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-25 06:19:34 (GMT) |
| commit | 05c543c75043824e12dac17a55e89bc11e74c7a4 (patch) | |
| tree | 4b9b117084b21dc9a8486befefd2f60c138c1ea4 /tests/auto/qhttp/tst_qhttp.cpp | |
| parent | 7bc18035816a2eac15dfac4d987eb9bf43f90ef6 (diff) | |
| parent | 6b79cbf5cadbaebef8be895a47ca314724afb1a1 (diff) | |
| download | Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.zip Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.tar.gz Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'tests/auto/qhttp/tst_qhttp.cpp')
| -rw-r--r-- | tests/auto/qhttp/tst_qhttp.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp index b4b6ceb..59bfb15 100644 --- a/tests/auto/qhttp/tst_qhttp.cpp +++ b/tests/auto/qhttp/tst_qhttp.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -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() |