diff --git a/examples/embedded/digiflip/digiflip.pro b/examples/embedded/digiflip/digiflip.pro
index 7fa06fa90a..cd64f7cba6 100644
--- a/examples/embedded/digiflip/digiflip.pro
+++ b/examples/embedded/digiflip/digiflip.pro
@@ -2,10 +2,10 @@ SOURCES = digiflip.cpp
 
 symbian {
     TARGET.UID3 = 0xA000CF72
-    CONFIG += qt_demo
+    CONFIG += qt_example
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/digiflip
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/digiflip
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip
 INSTALLS += target sources
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
index e9a448b1e3..2159b1931a 100644
--- a/examples/embedded/embedded.pro
+++ b/examples/embedded/embedded.pro
@@ -6,7 +6,7 @@ SUBDIRS += flightinfo
 
 # install
 sources.files = README *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded
 INSTALLS += sources
 
 symbian: CONFIG += qt_demo
diff --git a/examples/embedded/flickable/flickable.pro b/examples/embedded/flickable/flickable.pro
index 6ee744bc63..e90e64f89f 100644
--- a/examples/embedded/flickable/flickable.pro
+++ b/examples/embedded/flickable/flickable.pro
@@ -3,10 +3,10 @@ HEADERS = flickable.h
 
 symbian {
     TARGET.UID3 = 0xA000CF73
-    CONFIG += qt_demo
+    CONFIG += qt_example
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flickable
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flickable
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable
 INSTALLS += target sources
diff --git a/examples/embedded/flightinfo/flightinfo.pro b/examples/embedded/flightinfo/flightinfo.pro
index a33423f543..9fce741b9c 100644
--- a/examples/embedded/flightinfo/flightinfo.pro
+++ b/examples/embedded/flightinfo/flightinfo.pro
@@ -7,11 +7,11 @@ QT += network
 
 symbian {
     TARGET.UID3 = 0xA000CF74
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.CAPABILITY = NetworkServices
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flightinfo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flightinfo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo
 INSTALLS += target sources
diff --git a/examples/embedded/lightmaps/lightmaps.pro b/examples/embedded/lightmaps/lightmaps.pro
index 2751c3a647..7622f88511 100644
--- a/examples/embedded/lightmaps/lightmaps.pro
+++ b/examples/embedded/lightmaps/lightmaps.pro
@@ -10,12 +10,12 @@ QT += network
 
 symbian {
     TARGET.UID3 = 0xA000CF75
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.CAPABILITY = NetworkServices
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/lightmaps
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/lightmaps
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps
 INSTALLS += target sources
diff --git a/examples/embedded/raycasting/raycasting.pro b/examples/embedded/raycasting/raycasting.pro
index a4bb1826b9..83103a5aad 100644
--- a/examples/embedded/raycasting/raycasting.pro
+++ b/examples/embedded/raycasting/raycasting.pro
@@ -4,10 +4,10 @@ RESOURCES += raycasting.qrc
 
 symbian {
     TARGET.UID3 = 0xA000CF76
-    CONFIG += qt_demo
+    CONFIG += qt_example
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/raycasting
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/raycasting
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting
 INSTALLS += target sources
diff --git a/examples/examples.pro b/examples/examples.pro
index 9da2085675..3abcf22af7 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -48,6 +48,8 @@ symbian: SUBDIRS = \
     SUBDIRS += multimedia
 }
 
+wince*|symbian|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
+
 embedded:SUBDIRS += qws
 contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib
 contains(QT_CONFIG, opengl): SUBDIRS += opengl