diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-03-04 18:56:55 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-03-09 13:11:02 (GMT) |
| commit | 76342796aa83761a854fd8c0b477af0a1afc62c4 (patch) | |
| tree | a6294c02cc972e90619b5b318a89d021a4b15ed8 /tests | |
| parent | dc9ddf8e30800aab375587563b377068bbe99532 (diff) | |
| download | Qt-76342796aa83761a854fd8c0b477af0a1afc62c4.zip Qt-76342796aa83761a854fd8c0b477af0a1afc62c4.tar.gz Qt-76342796aa83761a854fd8c0b477af0a1afc62c4.tar.bz2 | |
Move some network tests from gui.pro to network.pro
These network tests have no dependency on the QtGui dll, so I have moved
them to the network autotest group.
In some cases this was not stated in the tests' .pro files.
The gui autotest group still has a network test (qtcpsocket), but this
has a dependency on QtGui for one test case (which uses QMessageBox)
Reviewed-by: Markus Goetz
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui.pro | 5 | ||||
| -rw-r--r-- | tests/auto/network.pro | 5 | ||||
| -rw-r--r-- | tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qnetworkreply/test/test.pro | 1 |
5 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index 07dc5ef..356a98d 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -113,9 +113,6 @@ SUBDIRS=\ qmouseevent_modal \ qmovie \ qnetworkaccessmanager_and_qprogressdialog \ - qnetworkcachemetadata \ - qnetworkdiskcache \ - qnetworkreply \ qpaintengine \ qpainterpath \ qpainterpathstroker \ @@ -168,7 +165,6 @@ SUBDIRS=\ qtabbar \ qtableview \ qtablewidget \ - qtcpserver \ qtcpsocket \ qtessellator \ qtextblock \ @@ -195,7 +191,6 @@ SUBDIRS=\ qtreeview \ qtreewidget \ qtreewidgetitemiterator \ - qudpsocket \ qundogroup \ qundostack \ qvectornd \ diff --git a/tests/auto/network.pro b/tests/auto/network.pro index 50c4487..e4cecce 100644 --- a/tests/auto/network.pro +++ b/tests/auto/network.pro @@ -19,12 +19,15 @@ SUBDIRS=\ platformsocketengine \ qnetworkaccessmanager \ qnetworkaddressentry \ + qnetworkcachemetadata \ qnetworkconfiguration \ qnetworkconfigurationmanager \ qnetworkcookie \ qnetworkcookiejar \ + qnetworkdiskcache \ qnetworkinterface \ qnetworkproxy \ + qnetworkreply \ qnetworkrequest \ qnetworksession \ qobjectperformance \ @@ -37,6 +40,8 @@ SUBDIRS=\ qsslsocket \ qsslsocket_onDemandCertificates_member \ qsslsocket_onDemandCertificates_static \ + qtcpserver \ + qudpsocket \ # qnetworkproxyfactory \ # Uses a hardcoded proxy configuration !contains(QT_CONFIG, private_tests): SUBDIRS -= \ diff --git a/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro b/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro index 77ad347..ae0941e 100644 --- a/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro +++ b/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT -= gui QT += network SOURCES += tst_qnetworkcachemetadata.cpp diff --git a/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro index 3b13087..c05171d 100644 --- a/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT -= gui QT += network SOURCES += tst_qnetworkdiskcache.cpp diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro index 12fdf04..80b879a 100644 --- a/tests/auto/qnetworkreply/test/test.pro +++ b/tests/auto/qnetworkreply/test/test.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT -= gui SOURCES += ../tst_qnetworkreply.cpp TARGET = ../tst_qnetworkreply |