summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-05-11 10:05:36 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-11 11:51:46 +1000
commited8c43b5eef3da60900b169a66f0baf8afd6f0a7 (patch)
tree910343b9993cd8acd3b41db82e14b267496db840 /tests
parent8e8e0b26b6674e15f1ea01b4a1a05169fa762722 (diff)
tests: mark some tests as using private API
These autotests are all using private symbols, available only when Qt is configured with -developer-build. So, gracefully disable them when the private symbols are not available. Reviewed-by: Jason McDonald Change-Id: Iafd1c7af486feeee810110bc021e75984827f78a
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib.pro3
-rw-r--r--tests/auto/gui.pro12
-rw-r--r--tests/auto/network.pro4
-rw-r--r--tests/auto/other.pro2
4 files changed, 20 insertions, 1 deletions
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 6810f766c4..95a16f67d9 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -112,3 +112,6 @@ symbian:SUBDIRS -= \
qtconcurrentrun \
qtconcurrentthreadengine \
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+ qfileinfo \
+
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 6de8ab9303..b7d4ad30b7 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -209,11 +209,23 @@ SUBDIRS=\
win32:SUBDIRS -= qtextpiecetable
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+ qcolumnview \
+ qgraphicsanchorlayout \
+ qgraphicsanchorlayout1 \
+ qgraphicsitem \
+ qgraphicsscene \
qgraphicssceneindex \
+ qlistwidget \
+ qmainwindow \
qnetworkreply \
qpathclipper \
+ qpixmapcache \
+ qsidebar \
qstylesheetstyle \
+ qtextlayout \
qtextpiecetable \
+ qtipc \
+ qtoolbar \
symbian:SUBDIRS -= \
qsystemtrayicon \
diff --git a/tests/auto/network.pro b/tests/auto/network.pro
index e4cecce450..7f9ef3c04e 100644
--- a/tests/auto/network.pro
+++ b/tests/auto/network.pro
@@ -45,10 +45,12 @@ SUBDIRS=\
# qnetworkproxyfactory \ # Uses a hardcoded proxy configuration
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+ platformsocketengine \
qauthenticator \
+ qhostinfo \
qhttpnetworkconnection \
qhttpnetworkreply \
- platformsocketengine \
+ qhttpsocketengine \
qsocketnotifier \
qsocks5socketengine \
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 881987910b..7da2505750 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -58,5 +58,7 @@ symbian {
# Following tests depends on private API
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+ qcombobox \
qcssparser \
+ qtextedit \