exclude gui-needing tests from -no-gui build

Change-Id: I91f7211efe44cbb41aa3058f85869a6babf121f3 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2013-10-08 14:51:00 +02:00 · 2013-10-08 14:51:00 +02:00 · bae926e66d
commit bae926e66d
parent 27b10259bc
4 changed files with 11 additions and 1 deletions
--- 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
--- 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 \
--- 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 \
--- 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 \