From bae926e66d74bbd5ab00d1d0bcb92671ab812e8e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 8 Oct 2013 14:51:00 +0200 Subject: exclude gui-needing tests from -no-gui build Change-Id: I91f7211efe44cbb41aa3058f85869a6babf121f3 Reviewed-by: Stephen Kelly --- tests/auto/auto.pro | 1 + tests/auto/corelib/io/io.pro | 4 ++++ tests/auto/corelib/itemmodels/itemmodels.pro | 4 +++- tests/auto/corelib/kernel/kernel.pro | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index e16f229c4e..3ff78a955f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -23,6 +23,7 @@ wince*: SUBDIRS -= printsupport cross_compile: SUBDIRS -= tools !qtHaveModule(opengl): SUBDIRS -= opengl !unix|embedded|!qtHaveModule(dbus): SUBDIRS -= dbus +!qtHaveModule(gui): SUBDIRS -= gui cmake !qtHaveModule(widgets): SUBDIRS -= widgets !qtHaveModule(printsupport): SUBDIRS -= printsupport !qtHaveModule(concurrent): SUBDIRS -= concurrent diff --git a/tests/auto/corelib/io/io.pro b/tests/auto/corelib/io/io.pro index 41d7e7e08b..ab66323d3b 100644 --- a/tests/auto/corelib/io/io.pro +++ b/tests/auto/corelib/io/io.pro @@ -38,6 +38,10 @@ SUBDIRS=\ qwinoverlappedionotifier } +!qtHaveModule(gui): SUBDIRS -= \ + qdatastream \ + qsettings + !qtHaveModule(network): SUBDIRS -= \ qfile \ qiodevice \ diff --git a/tests/auto/corelib/itemmodels/itemmodels.pro b/tests/auto/corelib/itemmodels/itemmodels.pro index 3f726692ff..7e0e3a0944 100644 --- a/tests/auto/corelib/itemmodels/itemmodels.pro +++ b/tests/auto/corelib/itemmodels/itemmodels.pro @@ -1,10 +1,12 @@ TEMPLATE=subdirs SUBDIRS = qabstractitemmodel \ + qstringlistmodel \ + +qtHaveModule(gui): SUBDIRS += \ qabstractproxymodel \ qidentityproxymodel \ qitemselectionmodel \ - qstringlistmodel \ qtHaveModule(widgets): SUBDIRS += \ qitemmodel \ diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index a283f5343d..fe3e4b7e0a 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -21,6 +21,9 @@ SUBDIRS=\ qvariant \ qwineventnotifier +!qtHaveModule(gui): SUBDIRS -= \ + qmimedata + !qtHaveModule(network): SUBDIRS -= \ qeventloop \ qobject \ -- cgit v1.2.3