summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-09-06 12:53:33 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-09 08:51:05 +0200
commit4d3a53305f8638ff60d32a548d94b3c603e5ffcd (patch)
tree3c98060f75c9ef2b1ecee7fde45cbd99b4fb297c
parent15eeb0e7dc300877a80b34eb4764502df85901ed (diff)
test: QFtp tests require `private_tests' set
Also fixing some includes and re-enabling the test Change-Id: I4a061e106c2e55db39b8000729737a93e3d7714a Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
-rw-r--r--src/network/access/qftp_p.h2
-rw-r--r--tests/auto/network/access/access.pro1
-rw-r--r--tests/auto/network/access/qftp/qftp.pro2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h
index 2e86522238..18d5e1b496 100644
--- a/src/network/access/qftp_p.h
+++ b/src/network/access/qftp_p.h
@@ -54,7 +54,7 @@
#define QFTP_H
#include <QtCore/qstring.h>
-#include <qurlinfo_p.h>
+#include <private/qurlinfo_p.h>
#include <QtCore/qobject.h>
QT_BEGIN_HEADER
diff --git a/tests/auto/network/access/access.pro b/tests/auto/network/access/access.pro
index 1e98d3cf85..3139f19f7b 100644
--- a/tests/auto/network/access/access.pro
+++ b/tests/auto/network/access/access.pro
@@ -8,6 +8,7 @@ SUBDIRS=\
qhttpnetworkconnection \
qnetworkreply \
qnetworkcachemetadata \
+ qftp \
qhttpnetworkreply \
qabstractnetworkcache \
diff --git a/tests/auto/network/access/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro
index 5d7d534192..917cd10837 100644
--- a/tests/auto/network/access/qftp/qftp.pro
+++ b/tests/auto/network/access/qftp/qftp.pro
@@ -2,7 +2,7 @@ CONFIG += testcase
TARGET = tst_qftp
SOURCES += tst_qftp.cpp
-
+requires(contains(QT_CONFIG,private_tests))
QT = core network network-private testlib
wince*: {