8 files changed, 43 insertions, 49 deletions
diff --git a/examples/painting/README b/examples/painting/README
index 4f9dca0181..541c553159 100644
--- a/examples/painting/README
+++ b/examples/painting/README
@@ -7,36 +7,5 @@ with Qt, from basic concepts such as drawing simple primitives to the use of
 transformations.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/painting/affine/affine.pro b/examples/painting/affine/affine.pro
index 4e4eee8882..1441811851 100644
--- a/examples/painting/affine/affine.pro
+++ b/examples/painting/affine/affine.pro
@@ -13,12 +13,16 @@ include($$SHARED_FOLDER/shared.pri)
 RESOURCES += affine.qrc
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/affine
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/affine
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
+symbian {
+    CONFIG += qt_example
+}
+
+maemo5: CONFIG += qt_example
 
 wince*: {
     DEPLOYMENT_PLUGIN += qjpeg
diff --git a/examples/painting/composition/composition.pro b/examples/painting/composition/composition.pro
index 00c500ea3b..c8e5ab0af3 100644
--- a/examples/painting/composition/composition.pro
+++ b/examples/painting/composition/composition.pro
@@ -12,12 +12,12 @@ contains(QT_CONFIG, opengl) {
 }
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/composition
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/composition
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example
 
 win32-msvc* {
     QMAKE_CXXFLAGS += /Zm500
diff --git a/examples/painting/deform/deform.pro b/examples/painting/deform/deform.pro
index d1c8938ad0..2bfc5d32cd 100644
--- a/examples/painting/deform/deform.pro
+++ b/examples/painting/deform/deform.pro
@@ -13,12 +13,12 @@ contains(QT_CONFIG, opengl) {
 }
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/deform
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/deform
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
 INSTALLS += target sources
 
 symbian {
     TARGET.UID3 = 0xA000A63D
-    CONFIG += qt_demo
+    CONFIG += qt_example
 }
diff --git a/examples/painting/gradients/gradients.pro b/examples/painting/gradients/gradients.pro
index ff292efba1..66f19c0801 100644
--- a/examples/painting/gradients/gradients.pro
+++ b/examples/painting/gradients/gradients.pro
@@ -12,9 +12,9 @@ contains(QT_CONFIG, opengl) {
 }
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/gradients
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/gradients
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example
diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro
index 68d4d73b62..263cc7326b 100644
--- a/examples/painting/painting.pro
+++ b/examples/painting/painting.pro
@@ -1,6 +1,12 @@
 TEMPLATE      = subdirs
 SUBDIRS       = basicdrawing \
                 concentriccircles \
+                examples_affine \
+                examples_composition \
+                examples_deform \
+                examples_gradients \
+                examples_pathstroke \
+                painting_shared \
                 imagecomposition \
                 painterpaths \
                 transformations \
@@ -15,3 +21,18 @@ INSTALLS += target sources
 symbian: CONFIG += qt_example
 QT += widgets
 maemo5: CONFIG += qt_example
+
+examples_affine.subdir = affine
+examples_composition.subdir = composition
+examples_deform.subdir = deform
+examples_gradients.subdir = gradients
+examples_pathstroke.subdir = pathstroke
+painting_shared.subdir = shared
+
+!ordered {
+    examples_affine.depends = painting_shared
+    examples_deform.depends = painting_shared
+    examples_gradients.depends = painting_shared
+    examples_composition.depends = painting_shared
+    examples_pathstroke.depends = painting_shared
+}
diff --git a/examples/painting/pathstroke/pathstroke.pro b/examples/painting/pathstroke/pathstroke.pro
index af6482fb48..d3f6596390 100644
--- a/examples/painting/pathstroke/pathstroke.pro
+++ b/examples/painting/pathstroke/pathstroke.pro
@@ -13,12 +13,12 @@ contains(QT_CONFIG, opengl) {
 }
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/pathstroke
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/pathstroke
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
 INSTALLS += target sources
 
 symbian {
     TARGET.UID3 = 0xA000A63E
-    CONFIG += qt_demo
+    CONFIG += qt_example
 }
diff --git a/examples/painting/shared/shared.pro b/examples/painting/shared/shared.pro
index 78aaaefe48..18f1d72398 100644
--- a/examples/painting/shared/shared.pro
+++ b/examples/painting/shared/shared.pro
@@ -26,9 +26,9 @@ HEADERS += \
 RESOURCES += shared.qrc
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/shared
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/shared
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
 INSTALLS += sources
 
 !cross_compile:INSTALLS += target