--- a/demos/demos.pro	Mon Jun 21 22:38:13 2010 +0100
+++ b/demos/demos.pro	Thu Jul 22 16:41:55 2010 +0100
@@ -1,4 +1,6 @@
 TEMPLATE    = subdirs
+
+!contains(QT_CONFIG, no-gui) {
 SUBDIRS     = \
             demos_shared \
             demos_deform \
@@ -38,12 +40,12 @@
             demos_undo \
             demos_sub-attaq
             
-contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):!contains(QT_CONFIG, opengles2):{
+contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles2):{
 SUBDIRS += demos_boxes
 }
 
 mac*: SUBDIRS += demos_macmainwindow
-wince*|symbian|embedded|x11: SUBDIRS += embedded
+wince*|symbian|embedded|x11: SUBDIRS += demos_embedded
 
 !contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin
 
@@ -55,6 +57,8 @@
 }
 contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer
 contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser
+contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative
+contains(QT_CONFIG, multimedia):SUBDIRS += demos_spectrum
 
 # install
 sources.files = README *.pro
@@ -65,6 +69,9 @@
 
 demos_chip.subdir = chip
 demos_embeddeddialogs.subdir = embeddeddialogs
+demos_embedded.subdir = embedded
+# Because of fluidlauncher
+demos_embedded.depends = demos_deform demos_pathstroke
 demos_shared.subdir = shared
 demos_deform.subdir = deform
 demos_gradients.subdir = gradients
@@ -82,11 +89,13 @@
 demos_undo.subdir = undo
 demos_qtdemo.subdir = qtdemo
 demos_mediaplayer.subdir = qmediaplayer
+demos_declarative.subdir = declarative
 
 demos_browser.subdir = browser
 
 demos_boxes.subdir = boxes
 demos_sub-attaq.subdir = sub-attaq
+demos_spectrum.subdir = spectrum
 
 #CONFIG += ordered
 !ordered {
@@ -97,3 +106,4 @@
      demos_arthurplugin.depends = demos_shared
      demos_pathstroke.depends = demos_shared
 }
+}