qt4: update examples for Qt 4.7

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

2 files changed, 570 insertions, 88 deletions

diff --git a/rules/qt4-examples.in b/rules/qt4-examples.in
index 1ddf06a16..5375ac25c 100644
--- a/rules/qt4-examples.in
+++ b/rules/qt4-examples.in
@@ -62,23 +62,6 @@ config QT4_EXAMPLES_ANIMATION_STICKMAN
 endif
 
 
-menuconfig QT4_EXAMPLES_ASSISTANT
-	bool
-	prompt "assistant"
-
-if QT4_EXAMPLES_ASSISTANT
-
-config QT4_EXAMPLES_ASSISTANT_SIMPLETEXTVIEWER
-	bool
-	prompt "simpletextviewer"
-	depends on QT4_BUILD_ASSISTANTLIB
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
-
-
-endif
-
-
 menuconfig QT4_EXAMPLES_DBUS
 	bool
 	prompt "dbus"
@@ -156,6 +139,269 @@ config QT4_EXAMPLES_DBUS_CONTROLLER
 endif
 
 
+menuconfig QT4_EXAMPLES_DECLARATIVE
+	bool
+	prompt "declarative"
+
+if QT4_EXAMPLES_DECLARATIVE
+
+config QT4_EXAMPLES_DECLARATIVE_NETWORKACCESSMANAGERFACTORY
+	bool
+	prompt "networkaccessmanagerfactory"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_LAYOUTITEM
+	bool
+	prompt "layoutitem"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_QGRAPHICSGRIDLAYOUT
+	bool
+	prompt "qgraphicsgridlayout"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_QGRAPHICSLINEARLAYOUT
+	bool
+	prompt "qgraphicslinearlayout"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_ADDING
+	bool
+	prompt "adding"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_ATTACHED
+	bool
+	prompt "attached"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_BINDING
+	bool
+	prompt "binding"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_COERCION
+	bool
+	prompt "coercion"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_DEFAULT
+	bool
+	prompt "default"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_EXTENDED
+	bool
+	prompt "extended"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_GROUPED
+	bool
+	prompt "grouped"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_METHODS
+	bool
+	prompt "methods"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_PROPERTIES
+	bool
+	prompt "properties"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_SIGNAL
+	bool
+	prompt "signal"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_VALUESOURCE
+	bool
+	prompt "valuesource"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_ABSTRACTITEMMODEL
+	bool
+	prompt "abstractitemmodel"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_OBJECTLISTMODEL
+	bool
+	prompt "objectlistmodel"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_STRINGLISTMODEL
+	bool
+	prompt "stringlistmodel"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_CHAPTER1_BASICS
+	bool
+	prompt "chapter1-basics"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_CHAPTER2_METHODS
+	bool
+	prompt "chapter2-methods"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_CHAPTER3_BINDINGS
+	bool
+	prompt "chapter3-bindings"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_CHAPTER4_CUSTOMPROPERTYTYPES
+	bool
+	prompt "chapter4-customPropertyTypes"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_DECLARATIVE_CHAPTER5_LISTPROPERTIES
+	bool
+	prompt "chapter5-listproperties"
+	depends on QT4_BUILD_DECLARATIVE
+	depends on QT4_BUILD_SCRIPT
+	depends on QT4_BUILD_SVG
+	depends on QT4_BUILD_SQL
+	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+
+endif
+
+
 menuconfig QT4_EXAMPLES_DESIGNER
 	bool
 	prompt "designer"
@@ -749,46 +995,25 @@ config QT4_EXAMPLES_MULTIMEDIA_VIDEOWIDGET
 endif
 
 
-menuconfig QT4_EXAMPLES_MULTITOUCH
-	bool
-	prompt "multitouch"
-
-if QT4_EXAMPLES_MULTITOUCH
-
-config QT4_EXAMPLES_MULTITOUCH_DIALS
+menuconfig QT4_EXAMPLES_NETWORK
 	bool
-	prompt "dials"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
+	prompt "network"
 
-config QT4_EXAMPLES_MULTITOUCH_FINGERPAINT
-	bool
-	prompt "fingerpaint"
-	depends on QT4_BUILD_GUI
-	depends on QT4_BUILD_NETWORK
+if QT4_EXAMPLES_NETWORK
 
-config QT4_EXAMPLES_MULTITOUCH_KNOBS
+config QT4_EXAMPLES_NETWORK_BEARERCLOUD
 	bool
-	prompt "knobs"
+	prompt "bearercloud"
+	depends on QT4_BUILD_SVG
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
-config QT4_EXAMPLES_MULTITOUCH_PINCHZOOM
+config QT4_EXAMPLES_NETWORK_BEARERMONITOR
 	bool
-	prompt "pinchzoom"
+	prompt "bearermonitor"
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
-
-endif
-
-
-menuconfig QT4_EXAMPLES_NETWORK
-	bool
-	prompt "network"
-
-if QT4_EXAMPLES_NETWORK
-
 config QT4_EXAMPLES_NETWORK_BLOCKINGFORTUNECLIENT
 	bool
 	prompt "blockingfortuneclient"
@@ -1403,7 +1628,6 @@ config QT4_EXAMPLES_THREADS_SEMAPHORES
 config QT4_EXAMPLES_THREADS_WAITCONDITIONS
 	bool
 	prompt "waitconditions"
-	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
 
@@ -1498,6 +1722,40 @@ config QT4_EXAMPLES_TOOLS_UNDOFRAMEWORK
 endif
 
 
+menuconfig QT4_EXAMPLES_TOUCH
+	bool
+	prompt "touch"
+
+if QT4_EXAMPLES_TOUCH
+
+config QT4_EXAMPLES_TOUCH_DIALS
+	bool
+	prompt "dials"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_TOUCH_FINGERPAINT
+	bool
+	prompt "fingerpaint"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_TOUCH_KNOBS
+	bool
+	prompt "knobs"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_TOUCH_PINCHZOOM
+	bool
+	prompt "pinchzoom"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+
+endif
+
+
 menuconfig QT4_EXAMPLES_TUTORIALS
 	bool
 	prompt "tutorials"
@@ -1546,6 +1804,48 @@ config QT4_EXAMPLES_TUTORIALS_PART7
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
+config QT4_EXAMPLES_TUTORIALS_MV_READONLY
+	bool
+	prompt "mv_readonly"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_TUTORIALS_MV_FORMATTING
+	bool
+	prompt "mv_formatting"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_TUTORIALS_MV_CHANGINGMODEL
+	bool
+	prompt "mv_changingmodel"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_TUTORIALS_MV_HEADERS
+	bool
+	prompt "mv_headers"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_TUTORIALS_MV_EDIT
+	bool
+	prompt "mv_edit"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_TUTORIALS_MV_TREE
+	bool
+	prompt "mv_tree"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_TUTORIALS_MV_SELECTIONS
+	bool
+	prompt "mv_selections"
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
 config QT4_EXAMPLES_TUTORIALS_CHILDWIDGET
 	bool
 	prompt "childwidget"
@@ -1608,9 +1908,6 @@ config QT4_EXAMPLES_WEBKIT_DOMTRAVERSAL
 	bool
 	prompt "domtraversal"
 	depends on QT4_BUILD_WEBKIT
-	depends on QT4_DBUS_LOAD || QT4_DBUS_LINK
-	depends on QT4_BUILD_XML
-	depends on QT4_BUILD_QTXMLPATTERNS
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
@@ -1618,9 +1915,6 @@ config QT4_EXAMPLES_WEBKIT_FANCYBROWSER
 	bool
 	prompt "fancybrowser"
 	depends on QT4_BUILD_WEBKIT
-	depends on QT4_DBUS_LOAD || QT4_DBUS_LINK
-	depends on QT4_BUILD_XML
-	depends on QT4_BUILD_QTXMLPATTERNS
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
@@ -1628,9 +1922,13 @@ config QT4_EXAMPLES_WEBKIT_FORMEXTRACTOR
 	bool
 	prompt "formextractor"
 	depends on QT4_BUILD_WEBKIT
-	depends on QT4_DBUS_LOAD || QT4_DBUS_LINK
-	depends on QT4_BUILD_XML
-	depends on QT4_BUILD_QTXMLPATTERNS
+	depends on QT4_BUILD_GUI
+	depends on QT4_BUILD_NETWORK
+
+config QT4_EXAMPLES_WEBKIT_IMAGEANALYZER
+	bool
+	prompt "imageanalyzer"
+	depends on QT4_BUILD_WEBKIT
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
@@ -1638,9 +1936,6 @@ config QT4_EXAMPLES_WEBKIT_PREVIEWER
 	bool
 	prompt "previewer"
 	depends on QT4_BUILD_WEBKIT
-	depends on QT4_DBUS_LOAD || QT4_DBUS_LINK
-	depends on QT4_BUILD_XML
-	depends on QT4_BUILD_QTXMLPATTERNS
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
@@ -1648,9 +1943,6 @@ config QT4_EXAMPLES_WEBKIT_SIMPLESELECTOR
 	bool
 	prompt "simpleselector"
 	depends on QT4_BUILD_WEBKIT
-	depends on QT4_DBUS_LOAD || QT4_DBUS_LINK
-	depends on QT4_BUILD_XML
-	depends on QT4_BUILD_QTXMLPATTERNS
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
 
@@ -1872,8 +2164,6 @@ config QT4_EXAMPLES_XMLPATTERNS_QOBJECTXMLMODEL
 	bool
 	prompt "qobjectxmlmodel"
 	depends on QT4_BUILD_WEBKIT
-	depends on QT4_DBUS_LOAD || QT4_DBUS_LINK
-	depends on QT4_BUILD_XML
 	depends on QT4_BUILD_QTXMLPATTERNS
 	depends on QT4_BUILD_GUI
 	depends on QT4_BUILD_NETWORK
diff --git a/rules/qt4-examples.make b/rules/qt4-examples.make
index dd2ce1bb1..39e9bd94f 100644
--- a/rules/qt4-examples.make
+++ b/rules/qt4-examples.make
@@ -49,12 +49,6 @@ ifdef PTXCONF_QT4_EXAMPLES_ANIMATION_STICKMAN
 		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/animation/stickman/stickman)
 endif
 
-ifdef PTXCONF_QT4_EXAMPLES_ASSISTANT_SIMPLETEXTVIEWER
-	@$(call install_copy, qt4-examples, 0, 0, 0755, \
-		$(QT4_DIR)-build/examples/assistant/simpletextviewer/simpletextviewer, \
-		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/assistant/simpletextviewer/simpletextviewer)
-endif
-
 ifdef PTXCONF_QT4_EXAMPLES_DBUS_COMPLEXPING
 	@$(call install_copy, qt4-examples, 0, 0, 0755, \
 		$(QT4_DIR)-build/examples/dbus/complexpingpong/complexpong, \
@@ -103,6 +97,144 @@ ifdef PTXCONF_QT4_EXAMPLES_DBUS_CONTROLLER
 		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/dbus/remotecontrolledcar/controller/controller)
 endif
 
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_NETWORKACCESSMANAGERFACTORY
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_LAYOUTITEM
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_QGRAPHICSGRIDLAYOUT
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_QGRAPHICSLINEARLAYOUT
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_ADDING
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/adding/adding, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/adding/adding)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_ATTACHED
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/attached/attached, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/attached/attached)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_BINDING
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/binding/binding, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/binding/binding)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_COERCION
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/coercion/coercion, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/coercion/coercion)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_DEFAULT
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/default/default, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/default/default)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_EXTENDED
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/extended/extended, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/extended/extended)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_GROUPED
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/grouped/grouped, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/grouped/grouped)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_METHODS
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/methods/methods, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/methods/methods)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_PROPERTIES
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/properties/properties, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/properties/properties)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_SIGNAL
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/signal/signal, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/signal/signal)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_VALUESOURCE
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/cppextensions/referenceexamples/valuesource/valuesource)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_ABSTRACTITEMMODEL
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/modelviews/abstractitemmodel/abstractitemmodel)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_OBJECTLISTMODEL
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/modelviews/objectlistmodel/objectlistmodel, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/modelviews/objectlistmodel/objectlistmodel)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_STRINGLISTMODEL
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/modelviews/stringlistmodel/stringlistmodel, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/modelviews/stringlistmodel/stringlistmodel)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_CHAPTER1_BASICS
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/tutorials/extending/chapter1-basics/chapter1-basics)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_CHAPTER2_METHODS
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/tutorials/extending/chapter2-methods/chapter2-methods)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_CHAPTER3_BINDINGS
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_CHAPTER4_CUSTOMPROPERTYTYPES
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_DECLARATIVE_CHAPTER5_LISTPROPERTIES
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties)
+endif
+
 ifdef PTXCONF_QT4_EXAMPLES_DESIGNER_CALCULATORBUILDER
 	@$(call install_copy, qt4-examples, 0, 0, 0755, \
 		$(QT4_DIR)-build/examples/designer/calculatorbuilder/calculatorbuilder, \
@@ -541,28 +673,16 @@ ifdef PTXCONF_QT4_EXAMPLES_MULTIMEDIA_VIDEOWIDGET
 		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/multimedia/videowidget/videowidget)
 endif
 
-ifdef PTXCONF_QT4_EXAMPLES_MULTITOUCH_DIALS
+ifdef PTXCONF_QT4_EXAMPLES_NETWORK_BEARERCLOUD
 	@$(call install_copy, qt4-examples, 0, 0, 0755, \
-		$(QT4_DIR)-build/examples/multitouch/dials/dials, \
-		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/multitouch/dials/dials)
+		$(QT4_DIR)-build/examples/network/bearercloud/bearercloud, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/network/bearercloud/bearercloud)
 endif
 
-ifdef PTXCONF_QT4_EXAMPLES_MULTITOUCH_FINGERPAINT
+ifdef PTXCONF_QT4_EXAMPLES_NETWORK_BEARERMONITOR
 	@$(call install_copy, qt4-examples, 0, 0, 0755, \
-		$(QT4_DIR)-build/examples/multitouch/fingerpaint/fingerpaint, \
-		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/multitouch/fingerpaint/fingerpaint)
-endif
-
-ifdef PTXCONF_QT4_EXAMPLES_MULTITOUCH_KNOBS
-	@$(call install_copy, qt4-examples, 0, 0, 0755, \
-		$(QT4_DIR)-build/examples/multitouch/knobs/knobs, \
-		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/multitouch/knobs/knobs)
-endif
-
-ifdef PTXCONF_QT4_EXAMPLES_MULTITOUCH_PINCHZOOM
-	@$(call install_copy, qt4-examples, 0, 0, 0755, \
-		$(QT4_DIR)-build/examples/multitouch/pinchzoom/pinchzoom, \
-		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/multitouch/pinchzoom/pinchzoom)
+		$(QT4_DIR)-build/examples/network/bearermonitor/bearermonitor, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/network/bearermonitor/bearermonitor)
 endif
 
 ifdef PTXCONF_QT4_EXAMPLES_NETWORK_BLOCKINGFORTUNECLIENT
@@ -1105,6 +1225,30 @@ ifdef PTXCONF_QT4_EXAMPLES_TOOLS_UNDOFRAMEWORK
 		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/tools/undoframework/undoframework)
 endif
 
+ifdef PTXCONF_QT4_EXAMPLES_TOUCH_DIALS
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/touch/dials/dials, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/touch/dials/dials)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_TOUCH_FINGERPAINT
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/touch/fingerpaint/fingerpaint, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/touch/fingerpaint/fingerpaint)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_TOUCH_KNOBS
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/touch/knobs/knobs, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/touch/knobs/knobs)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_TOUCH_PINCHZOOM
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/touch/pinchzoom/pinchzoom, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/touch/pinchzoom/pinchzoom)
+endif
+
 ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_PART1
 	@$(call install_copy, qt4-examples, 0, 0, 0755, \
 		$(QT4_DIR)-build/examples/tutorials/addressbook/part1/part1, \
@@ -1147,6 +1291,48 @@ ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_PART7
 		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/tutorials/addressbook/part7/part7)
 endif
 
+ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_MV_READONLY
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/tutorials/modelview/1_readonly/mv_readonly, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/tutorials/modelview/1_readonly/mv_readonly)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_MV_FORMATTING
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/tutorials/modelview/2_formatting/mv_formatting, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/tutorials/modelview/2_formatting/mv_formatting)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_MV_CHANGINGMODEL
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/tutorials/modelview/3_changingmodel/mv_changingmodel, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/tutorials/modelview/3_changingmodel/mv_changingmodel)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_MV_HEADERS
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/tutorials/modelview/4_headers/mv_headers, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/tutorials/modelview/4_headers/mv_headers)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_MV_EDIT
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/tutorials/modelview/5_edit/mv_edit, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/tutorials/modelview/5_edit/mv_edit)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_MV_TREE
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/tutorials/modelview/6_treeview/mv_tree, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/tutorials/modelview/6_treeview/mv_tree)
+endif
+
+ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_MV_SELECTIONS
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/tutorials/modelview/7_selections/mv_selections, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/tutorials/modelview/7_selections/mv_selections)
+endif
+
 ifdef PTXCONF_QT4_EXAMPLES_TUTORIALS_CHILDWIDGET
 	@$(call install_copy, qt4-examples, 0, 0, 0755, \
 		$(QT4_DIR)-build/examples/tutorials/widgets/childwidget/childwidget, \
@@ -1201,6 +1387,12 @@ ifdef PTXCONF_QT4_EXAMPLES_WEBKIT_FORMEXTRACTOR
 		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/webkit/formextractor/formextractor)
 endif
 
+ifdef PTXCONF_QT4_EXAMPLES_WEBKIT_IMAGEANALYZER
+	@$(call install_copy, qt4-examples, 0, 0, 0755, \
+		$(QT4_DIR)-build/examples/webkit/imageanalyzer/imageanalyzer, \
+		$(PTXCONF_QT4_EXAMPLES_INSTALL_DIR)/webkit/imageanalyzer/imageanalyzer)
+endif
+
 ifdef PTXCONF_QT4_EXAMPLES_WEBKIT_PREVIEWER
 	@$(call install_copy, qt4-examples, 0, 0, 0755, \
 		$(QT4_DIR)-build/examples/webkit/previewer/previewer, \