summaryrefslogtreecommitdiffstats
path: root/tests/auto/network.pro
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2011-04-28 09:11:42 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2011-04-28 09:11:42 (GMT)
commite3aa9ad1a15505fb2ac8e51e4da4e219efc62e66 (patch)
tree184d13abc3c189b5d3f29b891909b426cac85132 /tests/auto/network.pro
parentd8b933084ecc6ded6689f71ea6ca2e5fd339faf3 (diff)
parent8e615d9b07f6146b5cb6b56c4cd2e32376a8b429 (diff)
downloadQt-e3aa9ad1a15505fb2ac8e51e4da4e219efc62e66.zip
Qt-e3aa9ad1a15505fb2ac8e51e4da4e219efc62e66.tar.gz
Qt-e3aa9ad1a15505fb2ac8e51e4da4e219efc62e66.tar.bz2
Merge branch '4.8-upstream'
Diffstat (limited to 'tests/auto/network.pro')
-rw-r--r--tests/auto/network.pro9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/network.pro b/tests/auto/network.pro
index b427f1c..e4cecce 100644
--- a/tests/auto/network.pro
+++ b/tests/auto/network.pro
@@ -16,15 +16,18 @@ SUBDIRS=\
qhttpnetworkconnection \
qhttpnetworkreply \
qhttpsocketengine \
- qnativesocketengine \
+ platformsocketengine \
qnetworkaccessmanager \
qnetworkaddressentry \
+ qnetworkcachemetadata \
qnetworkconfiguration \
qnetworkconfigurationmanager \
qnetworkcookie \
qnetworkcookiejar \
+ qnetworkdiskcache \
qnetworkinterface \
qnetworkproxy \
+ qnetworkreply \
qnetworkrequest \
qnetworksession \
qobjectperformance \
@@ -37,13 +40,15 @@ SUBDIRS=\
qsslsocket \
qsslsocket_onDemandCertificates_member \
qsslsocket_onDemandCertificates_static \
+ qtcpserver \
+ qudpsocket \
# qnetworkproxyfactory \ # Uses a hardcoded proxy configuration
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
qauthenticator \
qhttpnetworkconnection \
qhttpnetworkreply \
- qnativesocketengine \
+ platformsocketengine \
qsocketnotifier \
qsocks5socketengine \