diff --git a/examples/examples.pro b/examples/examples.pro
index e402f29c98e..2180d185871 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 a049316e086..a2f18a478f6 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 a23c3d672a4..23221122d95 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 {