Add the painting demos-examples to build.

Change-Id: Ia6f23719af0ec3091573909b5666ec795ee22410
Reviewed-on: http://codereview.qt.nokia.com/685
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

diff --git a/examples/painting/composition/composition.pro b/examples/painting/composition/composition.pro
index 59b9112..3a55295 100644 (file)
--- 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 3393b8e..673b2e8 100644 (file)
--- 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 ed4120e..22a4baa 100644 (file)
--- 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 1a0bda7..33d9e35 100644 (file)
--- a/examples/painting/painting.pro
+++ b/examples/painting/painting.pro
@@ -2,6 +2,10 @@ TEMPLATE      = subdirs
 SUBDIRS       = basicdrawing \
                 concentriccircles \
                 examples_affine \
+                examples_composition \
+                examples_deform \
+                examples_gradients \
+                examples_pathstroke \
                 painting_shared \
                 imagecomposition \
                 painterpaths \
@@ -18,6 +22,10 @@ symbian: CONFIG += qt_example
 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 {
@@ -25,6 +33,5 @@ painting_shared.subdir = shared
     examples_deform.depends = painting_shared
     examples_gradients.depends = painting_shared
     examples_composition.depends = painting_shared
-    examples_arthurplugin.depends = painting_shared
     examples_pathstroke.depends = painting_shared
 }

diff --git a/examples/painting/pathstroke/pathstroke.pro b/examples/painting/pathstroke/pathstroke.pro
index 9bbf8a6..1d1efdc 100644 (file)
--- 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
 }