diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2013-02-19 13:06:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-19 19:20:53 +0100 |
| commit | 53dc49ffc8c2e9e84d80b3e0bbef948e99172f9a (patch) | |
| tree | 5b6114a152503a24575506df76805a3d7f9897cb /tests/auto | |
| parent | a19037cc9e66470f5e047390aa716930f168674b (diff) | |
Check for network module when building according auto tests
Change-Id: I68013bf8e07be8d202b3253f997d4f4db05335a4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/auto.pro | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/io/io.pro | 7 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/kernel.pro | 5 | ||||
| -rw-r--r-- | tests/auto/corelib/xml/xml.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/image/image.pro | 3 | ||||
| -rw-r--r-- | tests/auto/other/other.pro | 8 | ||||
| -rw-r--r-- | tests/auto/xml/sax/sax.pro | 4 |
7 files changed, 28 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 6ff0734186..037883aa18 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -22,3 +22,4 @@ cross_compile: SUBDIRS -= tools !unix|embedded|!qtHaveModule(dbus): SUBDIRS -= dbus !qtHaveModule(widgets): SUBDIRS -= widgets printsupport !qtHaveModule(concurrent): SUBDIRS -= concurrent +!qtHaveModule(network): SUBDIRS -= network diff --git a/tests/auto/corelib/io/io.pro b/tests/auto/corelib/io/io.pro index 948e9dec5f..a9a46be0ef 100644 --- a/tests/auto/corelib/io/io.pro +++ b/tests/auto/corelib/io/io.pro @@ -35,6 +35,13 @@ SUBDIRS=\ qwinoverlappedionotifier } +!qtHaveModule(network): SUBDIRS -= \ + qfile \ + qiodevice \ + qprocess \ + qtextstream +} + !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qabstractfileengine \ qfileinfo \ diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index 839d652be1..24b4c6d6eb 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -21,6 +21,11 @@ SUBDIRS=\ qvariant \ qwineventnotifier +!qtHaveModule(network): SUBDIRS -= \ + qeventloop \ + qobject \ + qsocketnotifier + !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qsocketnotifier \ qsharedmemory diff --git a/tests/auto/corelib/xml/xml.pro b/tests/auto/corelib/xml/xml.pro index 53836cb7f0..20519edf1b 100644 --- a/tests/auto/corelib/xml/xml.pro +++ b/tests/auto/corelib/xml/xml.pro @@ -1,3 +1,3 @@ TEMPLATE=subdirs -SUBDIRS=\ +qtHaveModule(network): SUBDIRS= \ qxmlstream diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro index 1ef52df4ba..9199763c40 100644 --- a/tests/auto/gui/image/image.pro +++ b/tests/auto/gui/image/image.pro @@ -11,6 +11,9 @@ SUBDIRS=\ qpicture \ qicon \ +!qtHaveModule(network): SUBDIRS -= \ + qimagereader + !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qpixmapcache \ diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 35aaf4d48f..1f7582243e 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -42,6 +42,14 @@ SUBDIRS=\ qaccessibility \ qaccessibilitylinux \ +!qtHaveModule(network): SUBDIRS -= \ + baselineexample \ + headersclean \ + lancelot \ + networkselftest \ + qnetworkaccessmanager_and_qprogressdialog \ + qobjectperformance + testcocoon: SUBDIRS -= headersclean cross_compile: SUBDIRS -= \ diff --git a/tests/auto/xml/sax/sax.pro b/tests/auto/xml/sax/sax.pro index 13aeb21d07..d232ee90e7 100644 --- a/tests/auto/xml/sax/sax.pro +++ b/tests/auto/xml/sax/sax.pro @@ -1,6 +1,8 @@ TEMPLATE=subdirs SUBDIRS=\ - qxmlinputsource \ qxml \ + +qtHaveModule(network): SUBDIRS += \ + qxmlinputsource \ qxmlsimplereader \ |