summaryrefslogtreecommitdiffstats
path: root/tests/auto/network
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-10-21 18:03:57 +0100
committerQt by Nokia <qt-info@nokia.com>2011-10-25 12:53:46 +0200
commitba995c372cd8e0d40f6648d7756038f4bb0e73ac (patch)
tree340907f9d32585618f9924693c331a131dd1c732 /tests/auto/network
parent8afc0676471b4802884ca7ee78d0097f1e5b5646 (diff)
QNetworkReply autotest no longer needs private_tests
Due to clearAccessCache being made part of the public API in Qt5, this autotest can be run on normal Qt builds again Task-number: QTBUG-17312 Change-Id: I3b70237a28ed141ffb49762cc40c8a528f9be6a8 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'tests/auto/network')
-rw-r--r--tests/auto/network/access/qnetworkreply/qnetworkreply.pro2
-rw-r--r--tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp3
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/network/access/qnetworkreply/qnetworkreply.pro b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro
index fd8454c235..0bcf067c4f 100644
--- a/tests/auto/network/access/qnetworkreply/qnetworkreply.pro
+++ b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro
@@ -1,6 +1,4 @@
TEMPLATE = subdirs
SUBDIRS = test
-requires(contains(QT_CONFIG,private_tests))
-
!wince*:SUBDIRS += echo
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 2c6718153b..e7a9f7d0d3 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -63,6 +63,7 @@
#include <QtNetwork/qnetworkcookie.h>
#include <QtNetwork/QHttpPart>
#include <QtNetwork/QHttpMultiPart>
+#include <QtNetwork/QNetworkProxyQuery>
#ifndef QT_NO_OPENSSL
#include <QtNetwork/qsslerror.h>
#include <QtNetwork/qsslconfiguration.h>
@@ -75,8 +76,6 @@
#include <time.h>
-#include "private/qnetworkaccessmanager_p.h"
-
#include "../../../network-settings.h"
Q_DECLARE_METATYPE(QSharedPointer<char>)