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>

diff --git a/examples/examples.pro b/examples/examples.pro
index 176a5c9..9cf603d 100644 (file)
--- 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 4e5fd6e..f41ba88 100644 (file)
--- 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