qt4: regenerate examples/demos with updated scriptsptxdist-2011.08.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 249 insertions, 243 deletions

diff --git a/rules/qt4-demos.in b/rules/qt4-demos.in
index 6e3f488dd..690f64012 100644
--- a/rules/qt4-demos.in
+++ b/rules/qt4-demos.in
@@ -6,7 +6,7 @@ menuconfig QT4_DEMOS
 	tristate
 	select QT4
 	select QT4_PREPARE_EXAMPLES
-	prompt "Qt Embedded Demos          "
+	prompt "Qt Embedded Demos             "
 
 if QT4_DEMOS
 
@@ -15,43 +15,9 @@ config QT4_DEMOS_INSTALL_DIR
 	default "/usr/bin/qt4-demos"
 	prompt "install dir"
 
-config QT4_DEMOS_BROWSER
-	bool
-	prompt "browser"
-	depends on QT4_BUILD_WEBKIT
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_INTERVIEW
-	bool
-	prompt "interview"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_SQLBROWSER
-	bool
-	prompt "sqlbrowser"
-	depends on BROKEN
-	depends on QT4_BUILD_SQL
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_QMEDIAPLAYER
-	bool
-	prompt "qmediaplayer"
-	depends on BROKEN
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_PATHSTROKE
-	bool
-	prompt "pathstroke"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_CHIP
+config QT4_DEMOS_AFFINE
 	bool
-	prompt "chip"
+	prompt "affine"
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
@@ -69,58 +35,29 @@ config QT4_DEMOS_BOXES
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
-config QT4_DEMOS_AFFINE
-	bool
-	prompt "affine"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_COMPOSITION
-	bool
-	prompt "composition"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_DEFORM
-	bool
-	prompt "deform"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_GRADIENTS
-	bool
-	prompt "gradients"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_EMBEDDEDDIALOGS
-	bool
-	prompt "embeddeddialogs"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_TEXTEDIT
+config QT4_DEMOS_BROWSER
 	bool
-	prompt "textedit"
+	prompt "browser"
+	depends on QT4_BUILD_WEBKIT
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
-config QT4_DEMOS_MAINWINDOW
+config QT4_DEMOS_CHIP
 	bool
-	prompt "mainwindow"
+	prompt "chip"
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
-config QT4_DEMOS_SPREADSHEET
+config QT4_DEMOS_COMPOSITION
 	bool
-	prompt "spreadsheet"
+	prompt "composition"
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
 
 menuconfig QT4_DEMOS_DECLARATIVE
 	bool
-	prompt "declarative"
+	prompt "declarative                 "
 
 if QT4_DEMOS_DECLARATIVE
 
@@ -137,22 +74,16 @@ config QT4_DEMOS_DECLARATIVE_MINEHUNT
 
 endif
 
-config QT4_DEMOS_SUB_ATTAQ
-	bool
-	prompt "sub-attaq"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-config QT4_DEMOS_UNDO
+config QT4_DEMOS_DEFORM
 	bool
-	prompt "undo"
+	prompt "deform"
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
 
 menuconfig QT4_DEMOS_EMBEDDED
 	bool
-	prompt "embedded"
+	prompt "embedded                    "
 
 if QT4_DEMOS_EMBEDDED
 
@@ -163,15 +94,15 @@ config QT4_DEMOS_EMBEDDED_ANOMALY
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
-config QT4_DEMOS_EMBEDDED_STYLEDEMO
+config QT4_DEMOS_EMBEDDED_DESKTOPSERVICES
 	bool
-	prompt "styledemo"
+	prompt "desktopservices"
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
-config QT4_DEMOS_EMBEDDED_RAYCASTING
+config QT4_DEMOS_EMBEDDED_DIGIFLIP
 	bool
-	prompt "raycasting"
+	prompt "digiflip"
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
@@ -182,24 +113,12 @@ config QT4_DEMOS_EMBEDDED_EMBEDDEDSVGVIEWER
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
-config QT4_DEMOS_EMBEDDED_LIGHTMAPS
-	bool
-	prompt "lightmaps"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
 config QT4_DEMOS_EMBEDDED_FLICKABLE
 	bool
 	prompt "flickable"
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
-config QT4_DEMOS_EMBEDDED_DESKTOPSERVICES
-	bool
-	prompt "desktopservices"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
 config QT4_DEMOS_EMBEDDED_FLIGHTINFO
 	bool
 	prompt "flightinfo"
@@ -219,9 +138,21 @@ config QT4_DEMOS_EMBEDDED_FLUIDLAUNCHER_LOCALCONFIG
        help
          install config.xml, slides and screenshots from projectroot
 endif
-config QT4_DEMOS_EMBEDDED_DIGIFLIP
+config QT4_DEMOS_EMBEDDED_LIGHTMAPS
 	bool
-	prompt "digiflip"
+	prompt "lightmaps"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_EMBEDDED_RAYCASTING
+	bool
+	prompt "raycasting"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_EMBEDDED_STYLEDEMO
+	bool
+	prompt "styledemo"
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
@@ -234,14 +165,89 @@ config QT4_DEMOS_EMBEDDED_WEATHERINFO
 
 endif
 
+config QT4_DEMOS_EMBEDDEDDIALOGS
+	bool
+	prompt "embeddeddialogs"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_GRADIENTS
+	bool
+	prompt "gradients"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_INTERVIEW
+	bool
+	prompt "interview"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_MAINWINDOW
+	bool
+	prompt "mainwindow"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_PATHSTROKE
+	bool
+	prompt "pathstroke"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_QMEDIAPLAYER
+	bool
+	prompt "qmediaplayer"
+	depends on BROKEN
+	depends on QT4_DBUS_LOAD || QT4_DBUS_LINK
+	depends on QT4_BUILD_XML
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
 config QT4_DEMOS_QTDEMO
 	bool
 	prompt "qtdemo"
 	depends on BROKEN
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_QTXMLPATTERNS
 	depends on QT4_BUILD_SQL
 	depends on QT4_BUILD_XML
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
+config QT4_DEMOS_SPREADSHEET
+	bool
+	prompt "spreadsheet"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_SQLBROWSER
+	bool
+	prompt "sqlbrowser"
+	depends on BROKEN
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_SUB_ATTAQ
+	bool
+	prompt "sub-attaq"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_TEXTEDIT
+	bool
+	prompt "textedit"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_DEMOS_UNDO
+	bool
+	prompt "undo"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
 endif
 
diff --git a/rules/qt4-demos.make b/rules/qt4-demos.make
index d7fc8679d..8cc757b5f 100644
--- a/rules/qt4-demos.make
+++ b/rules/qt4-demos.make
@@ -13,40 +13,10 @@ $(STATEDIR)/qt4.targetinstall3: $(STATEDIR)/qt4.targetinstall
 	@$(call install_fixup, qt4-demos,AUTHOR,"Christian Hemp <c.hemp@phytec.de")
 	@$(call install_fixup, qt4-demos,DESCRIPTION,missing)
 
-ifdef PTXCONF_QT4_DEMOS_BROWSER
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/browser/browser, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/browser/browser)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_INTERVIEW
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/interview/interview, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/interview/interview)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_SQLBROWSER
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/sqlbrowser/sqlbrowser, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/sqlbrowser/sqlbrowser)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_QMEDIAPLAYER
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/qmediaplayer/qmediaplayer, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/qmediaplayer/qmediaplayer)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_PATHSTROKE
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/pathstroke/pathstroke, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/pathstroke/pathstroke)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_CHIP
+ifdef PTXCONF_QT4_DEMOS_AFFINE
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/chip/chip, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/chip/chip)
+		$(QT4_DIR)-build/demos/affine/affine, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/affine/affine)
 endif
 
 ifdef PTXCONF_QT4_DEMOS_BOOKS
@@ -61,52 +31,22 @@ ifdef PTXCONF_QT4_DEMOS_BOXES
 		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/boxes/boxes)
 endif
 
-ifdef PTXCONF_QT4_DEMOS_AFFINE
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/affine/affine, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/affine/affine)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_COMPOSITION
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/composition/composition, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/composition/composition)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_DEFORM
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/deform/deform, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/deform/deform)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_GRADIENTS
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/gradients/gradients, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/gradients/gradients)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_EMBEDDEDDIALOGS
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/embeddeddialogs/embeddeddialogs, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embeddeddialogs/embeddeddialogs)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_TEXTEDIT
+ifdef PTXCONF_QT4_DEMOS_BROWSER
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/textedit/textedit, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/textedit/textedit)
+		$(QT4_DIR)-build/demos/browser/browser, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/browser/browser)
 endif
 
-ifdef PTXCONF_QT4_DEMOS_MAINWINDOW
+ifdef PTXCONF_QT4_DEMOS_CHIP
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/mainwindow/mainwindow, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/mainwindow/mainwindow)
+		$(QT4_DIR)-build/demos/chip/chip, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/chip/chip)
 endif
 
-ifdef PTXCONF_QT4_DEMOS_SPREADSHEET
+ifdef PTXCONF_QT4_DEMOS_COMPOSITION
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/spreadsheet/spreadsheet, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/spreadsheet/spreadsheet)
+		$(QT4_DIR)-build/demos/composition/composition, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/composition/composition)
 endif
 
 ifdef PTXCONF_QT4_DEMOS_DECLARATIVE_MINEHUNT
@@ -116,16 +56,10 @@ ifdef PTXCONF_QT4_DEMOS_DECLARATIVE_MINEHUNT
 
 endif
 
-ifdef PTXCONF_QT4_DEMOS_SUB_ATTAQ
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/sub-attaq/sub-attaq, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/sub-attaq/sub-attaq)
-endif
-
-ifdef PTXCONF_QT4_DEMOS_UNDO
+ifdef PTXCONF_QT4_DEMOS_DEFORM
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/undo/undo, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/undo/undo)
+		$(QT4_DIR)-build/demos/deform/deform, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/deform/deform)
 endif
 
 ifdef PTXCONF_QT4_DEMOS_EMBEDDED_ANOMALY
@@ -135,17 +69,17 @@ ifdef PTXCONF_QT4_DEMOS_EMBEDDED_ANOMALY
 
 endif
 
-ifdef PTXCONF_QT4_DEMOS_EMBEDDED_STYLEDEMO
+ifdef PTXCONF_QT4_DEMOS_EMBEDDED_DESKTOPSERVICES
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/embedded/styledemo/styledemo, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/styledemo/styledemo)
+		$(QT4_DIR)-build/demos/embedded/desktopservices/desktopservices, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/desktopservices/desktopservices)
 
 endif
 
-ifdef PTXCONF_QT4_DEMOS_EMBEDDED_RAYCASTING
+ifdef PTXCONF_QT4_DEMOS_EMBEDDED_DIGIFLIP
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/embedded/raycasting/raycasting, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/raycasting/raycasting)
+		$(QT4_DIR)-build/demos/embedded/digiflip/digiflip, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/digiflip/digiflip)
 
 endif
 
@@ -156,13 +90,6 @@ ifdef PTXCONF_QT4_DEMOS_EMBEDDED_EMBEDDEDSVGVIEWER
 
 endif
 
-ifdef PTXCONF_QT4_DEMOS_EMBEDDED_LIGHTMAPS
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/embedded/lightmaps/lightmaps, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/lightmaps/lightmaps)
-
-endif
-
 ifdef PTXCONF_QT4_DEMOS_EMBEDDED_FLICKABLE
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
 		$(QT4_DIR)-build/demos/embedded/flickable/flickable, \
@@ -170,13 +97,6 @@ ifdef PTXCONF_QT4_DEMOS_EMBEDDED_FLICKABLE
 
 endif
 
-ifdef PTXCONF_QT4_DEMOS_EMBEDDED_DESKTOPSERVICES
-	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/embedded/desktopservices/desktopservices, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/desktopservices/desktopservices)
-
-endif
-
 ifdef PTXCONF_QT4_DEMOS_EMBEDDED_FLIGHTINFO
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
 		$(QT4_DIR)-build/demos/embedded/flightinfo/flightinfo, \
@@ -212,10 +132,24 @@ endif
 
 endif
 
-ifdef PTXCONF_QT4_DEMOS_EMBEDDED_DIGIFLIP
+ifdef PTXCONF_QT4_DEMOS_EMBEDDED_LIGHTMAPS
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
-		$(QT4_DIR)-build/demos/embedded/digiflip/digiflip, \
-		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/digiflip/digiflip)
+		$(QT4_DIR)-build/demos/embedded/lightmaps/lightmaps, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/lightmaps/lightmaps)
+
+endif
+
+ifdef PTXCONF_QT4_DEMOS_EMBEDDED_RAYCASTING
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/embedded/raycasting/raycasting, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/raycasting/raycasting)
+
+endif
+
+ifdef PTXCONF_QT4_DEMOS_EMBEDDED_STYLEDEMO
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/embedded/styledemo/styledemo, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embedded/styledemo/styledemo)
 
 endif
 
@@ -226,12 +160,78 @@ ifdef PTXCONF_QT4_DEMOS_EMBEDDED_WEATHERINFO
 
 endif
 
+ifdef PTXCONF_QT4_DEMOS_EMBEDDEDDIALOGS
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/embeddeddialogs/embeddeddialogs, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/embeddeddialogs/embeddeddialogs)
+endif
+
+ifdef PTXCONF_QT4_DEMOS_GRADIENTS
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/gradients/gradients, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/gradients/gradients)
+endif
+
+ifdef PTXCONF_QT4_DEMOS_INTERVIEW
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/interview/interview, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/interview/interview)
+endif
+
+ifdef PTXCONF_QT4_DEMOS_MAINWINDOW
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/mainwindow/mainwindow, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/mainwindow/mainwindow)
+endif
+
+ifdef PTXCONF_QT4_DEMOS_PATHSTROKE
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/pathstroke/pathstroke, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/pathstroke/pathstroke)
+endif
+
+ifdef PTXCONF_QT4_DEMOS_QMEDIAPLAYER
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/qmediaplayer/qmediaplayer, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/qmediaplayer/qmediaplayer)
+endif
+
 ifdef PTXCONF_QT4_DEMOS_QTDEMO
 	@$(call install_copy, qt4-demos, 0, 0, 0755, \
 		$(QT4_DIR)-build/demos/qtdemo/../../bin/qtdemo, \
 		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/qtdemo/../../bin/qtdemo)
 endif
 
+ifdef PTXCONF_QT4_DEMOS_SPREADSHEET
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/spreadsheet/spreadsheet, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/spreadsheet/spreadsheet)
+endif
+
+ifdef PTXCONF_QT4_DEMOS_SQLBROWSER
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/sqlbrowser/sqlbrowser, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/sqlbrowser/sqlbrowser)
+endif
+
+ifdef PTXCONF_QT4_DEMOS_SUB_ATTAQ
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/sub-attaq/sub-attaq, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/sub-attaq/sub-attaq)
+endif
+
+ifdef PTXCONF_QT4_DEMOS_TEXTEDIT
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/textedit/textedit, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/textedit/textedit)
+endif
+
+ifdef PTXCONF_QT4_DEMOS_UNDO
+	@$(call install_copy, qt4-demos, 0, 0, 0755, \
+		$(QT4_DIR)-build/demos/undo/undo, \
+		$(PTXCONF_QT4_DEMOS_INSTALL_DIR)/undo/undo)
+endif
+
 
 	@$(call install_finish, qt4-demos)
 	@$(call touch)
diff --git a/rules/qt4-examples.in b/rules/qt4-examples.in
index 5375ac25c..51f0fb2aa 100644
--- a/rules/qt4-examples.in
+++ b/rules/qt4-examples.in
@@ -18,7 +18,7 @@ config QT4_EXAMPLES_INSTALL_DIR
 
 menuconfig QT4_EXAMPLES_ANIMATION
 	bool
-	prompt "animation"
+	prompt "animation                   "
 
 if QT4_EXAMPLES_ANIMATION
 
@@ -64,7 +64,7 @@ endif
 
 menuconfig QT4_EXAMPLES_DBUS
 	bool
-	prompt "dbus"
+	prompt "dbus                        "
 
 if QT4_EXAMPLES_DBUS
 
@@ -141,7 +141,7 @@ endif
 
 menuconfig QT4_EXAMPLES_DECLARATIVE
 	bool
-	prompt "declarative"
+	prompt "declarative                 "
 
 if QT4_EXAMPLES_DECLARATIVE
 
@@ -404,7 +404,7 @@ endif
 
 menuconfig QT4_EXAMPLES_DESIGNER
 	bool
-	prompt "designer"
+	prompt "designer                    "
 
 if QT4_EXAMPLES_DESIGNER
 
@@ -436,7 +436,7 @@ endif
 
 menuconfig QT4_EXAMPLES_DESKTOP
 	bool
-	prompt "desktop"
+	prompt "desktop                     "
 
 if QT4_EXAMPLES_DESKTOP
 
@@ -460,7 +460,7 @@ endif
 
 menuconfig QT4_EXAMPLES_DIALOGS
 	bool
-	prompt "dialogs"
+	prompt "dialogs                     "
 
 if QT4_EXAMPLES_DIALOGS
 
@@ -518,7 +518,7 @@ endif
 
 menuconfig QT4_EXAMPLES_DRAGANDDROP
 	bool
-	prompt "draganddrop"
+	prompt "draganddrop                 "
 
 if QT4_EXAMPLES_DRAGANDDROP
 
@@ -565,7 +565,7 @@ endif
 
 menuconfig QT4_EXAMPLES_EFFECTS
 	bool
-	prompt "effects"
+	prompt "effects                     "
 
 if QT4_EXAMPLES_EFFECTS
 
@@ -593,7 +593,7 @@ endif
 
 menuconfig QT4_EXAMPLES_GESTURES
 	bool
-	prompt "gestures"
+	prompt "gestures                    "
 
 if QT4_EXAMPLES_GESTURES
 
@@ -609,7 +609,7 @@ endif
 
 menuconfig QT4_EXAMPLES_GRAPHICSVIEW
 	bool
-	prompt "graphicsview"
+	prompt "graphicsview                "
 
 if QT4_EXAMPLES_GRAPHICSVIEW
 
@@ -673,7 +673,7 @@ endif
 
 menuconfig QT4_EXAMPLES_HELP
 	bool
-	prompt "help"
+	prompt "help                        "
 
 if QT4_EXAMPLES_HELP
 
@@ -703,7 +703,7 @@ endif
 
 menuconfig QT4_EXAMPLES_IPC
 	bool
-	prompt "ipc"
+	prompt "ipc                         "
 
 if QT4_EXAMPLES_IPC
 
@@ -731,7 +731,7 @@ endif
 
 menuconfig QT4_EXAMPLES_ITEMVIEWS
 	bool
-	prompt "itemviews"
+	prompt "itemviews                   "
 
 if QT4_EXAMPLES_ITEMVIEWS
 
@@ -844,7 +844,7 @@ endif
 
 menuconfig QT4_EXAMPLES_LAYOUTS
 	bool
-	prompt "layouts"
+	prompt "layouts                     "
 
 if QT4_EXAMPLES_LAYOUTS
 
@@ -878,7 +878,7 @@ endif
 
 menuconfig QT4_EXAMPLES_LINGUIST
 	bool
-	prompt "linguist"
+	prompt "linguist                    "
 
 if QT4_EXAMPLES_LINGUIST
 
@@ -906,7 +906,7 @@ endif
 
 menuconfig QT4_EXAMPLES_MAINWINDOWS
 	bool
-	prompt "mainwindows"
+	prompt "mainwindows                 "
 
 if QT4_EXAMPLES_MAINWINDOWS
 
@@ -952,7 +952,7 @@ endif
 
 menuconfig QT4_EXAMPLES_MULTIMEDIA
 	bool
-	prompt "multimedia"
+	prompt "multimedia                  "
 
 if QT4_EXAMPLES_MULTIMEDIA
 
@@ -997,7 +997,7 @@ endif
 
 menuconfig QT4_EXAMPLES_NETWORK
 	bool
-	prompt "network"
+	prompt "network                     "
 
 if QT4_EXAMPLES_NETWORK
 
@@ -1109,7 +1109,7 @@ endif
 
 menuconfig QT4_EXAMPLES_OPENGL
 	bool
-	prompt "opengl"
+	prompt "opengl                      "
 
 if QT4_EXAMPLES_OPENGL
 
@@ -1207,7 +1207,7 @@ endif
 
 menuconfig QT4_EXAMPLES_OPENVG
 	bool
-	prompt "openvg"
+	prompt "openvg                      "
 
 if QT4_EXAMPLES_OPENVG
 
@@ -1224,7 +1224,7 @@ endif
 
 menuconfig QT4_EXAMPLES_PAINTING
 	bool
-	prompt "painting"
+	prompt "painting                    "
 
 if QT4_EXAMPLES_PAINTING
 
@@ -1285,7 +1285,7 @@ endif
 
 menuconfig QT4_EXAMPLES_PHONON
 	bool
-	prompt "phonon"
+	prompt "phonon                      "
 
 if QT4_EXAMPLES_PHONON
 
@@ -1311,7 +1311,7 @@ endif
 
 menuconfig QT4_EXAMPLES_QTCONCURRENT
 	bool
-	prompt "qtconcurrent"
+	prompt "qtconcurrent                "
 
 if QT4_EXAMPLES_QTCONCURRENT
 
@@ -1351,7 +1351,7 @@ endif
 
 menuconfig QT4_EXAMPLES_QTESTLIB
 	bool
-	prompt "qtestlib"
+	prompt "qtestlib                    "
 
 if QT4_EXAMPLES_QTESTLIB
 
@@ -1396,7 +1396,7 @@ endif
 
 menuconfig QT4_EXAMPLES_QWS
 	bool
-	prompt "qws"
+	prompt "qws                         "
 
 if QT4_EXAMPLES_QWS
 
@@ -1425,7 +1425,7 @@ endif
 
 menuconfig QT4_EXAMPLES_RICHTEXT
 	bool
-	prompt "richtext"
+	prompt "richtext                    "
 
 if QT4_EXAMPLES_RICHTEXT
 
@@ -1460,7 +1460,7 @@ endif
 
 menuconfig QT4_EXAMPLES_SCRIPT
 	bool
-	prompt "script"
+	prompt "script                      "
 
 if QT4_EXAMPLES_SCRIPT
 
@@ -1509,7 +1509,7 @@ endif
 
 menuconfig QT4_EXAMPLES_SQL
 	bool
-	prompt "sql"
+	prompt "sql                         "
 
 if QT4_EXAMPLES_SQL
 
@@ -1569,7 +1569,7 @@ endif
 
 menuconfig QT4_EXAMPLES_STATEMACHINE
 	bool
-	prompt "statemachine"
+	prompt "statemachine                "
 
 if QT4_EXAMPLES_STATEMACHINE
 
@@ -1611,7 +1611,7 @@ endif
 
 menuconfig QT4_EXAMPLES_THREADS
 	bool
-	prompt "threads"
+	prompt "threads                     "
 
 if QT4_EXAMPLES_THREADS
 
@@ -1636,7 +1636,7 @@ endif
 
 menuconfig QT4_EXAMPLES_TOOLS
 	bool
-	prompt "tools"
+	prompt "tools                       "
 
 if QT4_EXAMPLES_TOOLS
 
@@ -1724,7 +1724,7 @@ endif
 
 menuconfig QT4_EXAMPLES_TOUCH
 	bool
-	prompt "touch"
+	prompt "touch                       "
 
 if QT4_EXAMPLES_TOUCH
 
@@ -1758,7 +1758,7 @@ endif
 
 menuconfig QT4_EXAMPLES_TUTORIALS
 	bool
-	prompt "tutorials"
+	prompt "tutorials                   "
 
 if QT4_EXAMPLES_TUTORIALS
 
@@ -1876,7 +1876,7 @@ endif
 
 menuconfig QT4_EXAMPLES_UITOOLS
 	bool
-	prompt "uitools"
+	prompt "uitools                     "
 
 if QT4_EXAMPLES_UITOOLS
 
@@ -1900,7 +1900,7 @@ endif
 
 menuconfig QT4_EXAMPLES_WEBKIT
 	bool
-	prompt "webkit"
+	prompt "webkit                      "
 
 if QT4_EXAMPLES_WEBKIT
 
@@ -1952,7 +1952,7 @@ endif
 
 menuconfig QT4_EXAMPLES_WIDGETS
 	bool
-	prompt "widgets"
+	prompt "widgets                     "
 
 if QT4_EXAMPLES_WIDGETS
 
@@ -2100,7 +2100,7 @@ endif
 
 menuconfig QT4_EXAMPLES_XML
 	bool
-	prompt "xml"
+	prompt "xml                         "
 
 if QT4_EXAMPLES_XML
 
@@ -2149,7 +2149,7 @@ endif
 
 menuconfig QT4_EXAMPLES_XMLPATTERNS
 	bool
-	prompt "xmlpatterns"
+	prompt "xmlpatterns                 "
 
 if QT4_EXAMPLES_XMLPATTERNS