diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
| commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
| tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /examples | |
| parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
| parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) | |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 7 | ||||
| -rw-r--r-- | examples/statemachine/statemachine.pro | 2 |
2 files changed, 6 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 \ |