diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-03-16 12:53:35 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-19 20:16:04 +0100 |
| commit | 10df7967d996f4ec54744a8dd48e41b318377e73 (patch) | |
| tree | 4831ccd2ebea27a5b29a5095df79fca36b31523d | |
| parent | 336f24465a106553dae26ac84a3c43f9ad939a57 (diff) | |
Disable some tests and examples when --no-widgets is specified
There are many tests, examples that depends on widgets. This patch
disables some of them if Qt is configured without widgets.
Change-Id: I5460dadca736c54221874adcd518a7021725d90a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | examples/examples.pro | 7 | ||||
| -rw-r--r-- | examples/statemachine/statemachine.pro | 2 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index e402f29c98..2180d18587 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -15,7 +15,6 @@ SUBDIRS = \ effects \ graphicsview \ ipc \ - itemviews \ layouts \ linguist \ mainwindows \ @@ -25,9 +24,13 @@ SUBDIRS = \ sql \ tools \ tutorials \ - widgets \ touch \ gestures + + !contains(QT_CONFIG, no-widgets) { + SUBDIRS += widgets \ + itemviews + } } wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded diff --git a/examples/statemachine/statemachine.pro b/examples/statemachine/statemachine.pro index a049316e08..a2f18a478f 100644 --- a/examples/statemachine/statemachine.pro +++ b/examples/statemachine/statemachine.pro @@ -3,7 +3,7 @@ SUBDIRS = \ factorial \ pingpong -!contains(QT_CONFIG, no-gui) { +!contains(QT_CONFIG, no-widgets) { SUBDIRS += \ eventtransitions \ rogue \ diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index a23c3d672a..23221122d9 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -18,6 +18,7 @@ SUBDIRS += \ cross_compile: SUBDIRS -= tools !contains(QT_CONFIG, opengl): SUBDIRS -= opengl !unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus +contains(QT_CONFIG, no-widgets): SUBDIRS -= widgets # disable 'make check' on Mac OS X for the following subdirs for the time being mac { |