Check for network module when building according auto tests

Change-Id: I68013bf8e07be8d202b3253f997d4f4db05335a4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Oliver Wolff 2013-02-19 13:06:34 +01:00 committed by The Qt Project
parent a19037cc9e
commit 53dc49ffc8
7 changed files with 28 additions and 2 deletions

View File

@ -22,3 +22,4 @@ cross_compile: SUBDIRS -= tools
!unix|embedded|!qtHaveModule(dbus): SUBDIRS -= dbus !unix|embedded|!qtHaveModule(dbus): SUBDIRS -= dbus
!qtHaveModule(widgets): SUBDIRS -= widgets printsupport !qtHaveModule(widgets): SUBDIRS -= widgets printsupport
!qtHaveModule(concurrent): SUBDIRS -= concurrent !qtHaveModule(concurrent): SUBDIRS -= concurrent
!qtHaveModule(network): SUBDIRS -= network

View File

@ -35,6 +35,13 @@ SUBDIRS=\
qwinoverlappedionotifier qwinoverlappedionotifier
} }
!qtHaveModule(network): SUBDIRS -= \
qfile \
qiodevice \
qprocess \
qtextstream
}
!contains(QT_CONFIG, private_tests): SUBDIRS -= \ !contains(QT_CONFIG, private_tests): SUBDIRS -= \
qabstractfileengine \ qabstractfileengine \
qfileinfo \ qfileinfo \

View File

@ -21,6 +21,11 @@ SUBDIRS=\
qvariant \ qvariant \
qwineventnotifier qwineventnotifier
!qtHaveModule(network): SUBDIRS -= \
qeventloop \
qobject \
qsocketnotifier
!contains(QT_CONFIG, private_tests): SUBDIRS -= \ !contains(QT_CONFIG, private_tests): SUBDIRS -= \
qsocketnotifier \ qsocketnotifier \
qsharedmemory qsharedmemory

View File

@ -1,3 +1,3 @@
TEMPLATE=subdirs TEMPLATE=subdirs
SUBDIRS=\ qtHaveModule(network): SUBDIRS= \
qxmlstream qxmlstream

View File

@ -11,6 +11,9 @@ SUBDIRS=\
qpicture \ qpicture \
qicon \ qicon \
!qtHaveModule(network): SUBDIRS -= \
qimagereader
!contains(QT_CONFIG, private_tests): SUBDIRS -= \ !contains(QT_CONFIG, private_tests): SUBDIRS -= \
qpixmapcache \ qpixmapcache \

View File

@ -42,6 +42,14 @@ SUBDIRS=\
qaccessibility \ qaccessibility \
qaccessibilitylinux \ qaccessibilitylinux \
!qtHaveModule(network): SUBDIRS -= \
baselineexample \
headersclean \
lancelot \
networkselftest \
qnetworkaccessmanager_and_qprogressdialog \
qobjectperformance
testcocoon: SUBDIRS -= headersclean testcocoon: SUBDIRS -= headersclean
cross_compile: SUBDIRS -= \ cross_compile: SUBDIRS -= \

View File

@ -1,6 +1,8 @@
TEMPLATE=subdirs TEMPLATE=subdirs
SUBDIRS=\ SUBDIRS=\
qxmlinputsource \
qxml \ qxml \
qtHaveModule(network): SUBDIRS += \
qxmlinputsource \
qxmlsimplereader \ qxmlsimplereader \