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>

diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h
index 2e86522..18d5e1b 100644 (file)
--- 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 1e98d3c..3139f19 100644 (file)
--- 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 5d7d534..917cd10 100644 (file)
--- 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*: {