Add the richtext and tools demo-examples to build.

Change-Id: I3a64dc0fb11f9ebbcb0cb2f97598370ca5962a3c
Reviewed-on: http://codereview.qt.nokia.com/773
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie

diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
index c9ed843..7e2720a 100644 (file)
--- a/examples/richtext/richtext.pro
+++ b/examples/richtext/richtext.pro
@@ -1,7 +1,8 @@
 TEMPLATE    = subdirs
 SUBDIRS     = calendar \
               orderform \
-              syntaxhighlighter
+              syntaxhighlighter \
+              textedit
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext

diff --git a/examples/richtext/textedit/textedit.pro b/examples/richtext/textedit/textedit.pro
index b37ac30..328de6e 100644 (file)
--- a/examples/richtext/textedit/textedit.pro
+++ b/examples/richtext/textedit/textedit.pro
@@ -14,9 +14,9 @@ build_all:!build_pass {
 }
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/textedit
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/textedit
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example

diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro
index 5335b7f..c6e0250 100644 (file)
--- a/examples/tools/tools.pro
+++ b/examples/tools/tools.pro
@@ -13,6 +13,7 @@ SUBDIRS       = codecs \
                 settingseditor \
                 styleplugin \
                 treemodelcompleter \
+                undo \
                 undoframework
 
 plugandpaint.depends = plugandpaintplugins

diff --git a/examples/tools/undo/undo.pro b/examples/tools/undo/undo.pro
index 84f1d7b..0c7c40d 100644 (file)
--- a/examples/tools/undo/undo.pro
+++ b/examples/tools/undo/undo.pro
@@ -10,9 +10,9 @@ build_all:!build_pass {
 RESOURCES += undo.qrc
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
 sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example