summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasper van Donderen <[email protected]>2011-06-27 10:31:24 +0200
committerQt by Nokia <[email protected]>2011-06-28 14:20:51 +0200
commit6f262a60d19a68ed8bfedf26839aec96d16c2550 (patch)
treeb58db5609a4ee1d14abbc8cefe5fb9766b185e01
parenta964e56228d147c1acf748e4fe69004593d38c2d (diff)
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 <[email protected]> Reviewed-by: David Boddie
-rw-r--r--examples/richtext/richtext.pro3
-rw-r--r--examples/richtext/textedit/textedit.pro6
-rw-r--r--examples/tools/tools.pro1
-rw-r--r--examples/tools/undo/undo.pro6
4 files changed, 9 insertions, 7 deletions
diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
index c9ed843a61c..7e2720a2c6c 100644
--- 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 b37ac3036aa..328de6e51eb 100644
--- 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 5335b7fe6a0..c6e02509347 100644
--- 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 84f1d7b3260..0c7c40dd5f9 100644
--- 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