diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-07-26 16:29:13 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-27 03:27:27 +0200 |
| commit | 0feb2646748a65bafea8485104a2d5833c0d1558 (patch) | |
| tree | 7465915a014ee27e63dc1ebae36678858edfa523 /examples | |
| parent | 9784dd8d06565177a302d4dabec0b6555a958e53 (diff) | |
examples: fixed compile with -no-widgets
Disable a few examples depending on widgets which had previously been
missed.
Change-Id: Ic9c7cda94f690ee9d541c742997b7db9ace40fe0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 4 | ||||
| -rw-r--r-- | examples/qtconcurrent/qtconcurrent.pro | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 176a5c95c5..9cf603da47 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -36,8 +36,8 @@ SUBDIRS = \ } wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded -contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib -contains(QT_CONFIG, opengl): SUBDIRS += opengl +contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):!contains(QT_CONFIG, no-widgets):SUBDIRS += qtestlib +contains(QT_CONFIG, opengl):!contains(QT_CONFIG, no-widgets):SUBDIRS += opengl contains(QT_CONFIG, dbus): SUBDIRS += dbus contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro index 4e5fd6ed7d..f41ba881a2 100644 --- a/examples/qtconcurrent/qtconcurrent.pro +++ b/examples/qtconcurrent/qtconcurrent.pro @@ -8,6 +8,14 @@ SUBDIRS = imagescaling \ SUBDIRS += progressdialog } +contains(QT_CONFIG, no-widgets) { + SUBDIRS -= \ + imagescaling \ + progressdialog \ + runfunction \ + wordcount +} + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README |