summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-10-08 14:51:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-18 20:05:27 +0200
commitbae926e66d74bbd5ab00d1d0bcb92671ab812e8e (patch)
tree5328bc19e1f071c6630f67872b652f233e7dd830
parent27b10259bcca78f5e3e757b3c97695a544d59379 (diff)
exclude gui-needing tests from -no-gui build
Change-Id: I91f7211efe44cbb41aa3058f85869a6babf121f3 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
-rw-r--r--tests/auto/auto.pro1
-rw-r--r--tests/auto/corelib/io/io.pro4
-rw-r--r--tests/auto/corelib/itemmodels/itemmodels.pro4
-rw-r--r--tests/auto/corelib/kernel/kernel.pro3
4 files changed, 11 insertions, 1 deletions
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 \