Update sql and animation demos to be an example.

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

diff --git a/examples/animation/animation.pro b/examples/animation/animation.pro
index 4a9064d..e5fa7c4 100644 (file)
--- a/examples/animation/animation.pro
+++ b/examples/animation/animation.pro
@@ -7,6 +7,7 @@ SUBDIRS          += \
                  moveblocks \
                  states \
                  stickman \
+                 sub-attaq \
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation

diff --git a/examples/animation/sub-attaq/sub-attaq.pro b/examples/animation/sub-attaq/sub-attaq.pro
index 5575f5e..ff30404 100644 (file)
--- a/examples/animation/sub-attaq/sub-attaq.pro
+++ b/examples/animation/sub-attaq/sub-attaq.pro
@@ -29,13 +29,13 @@ SOURCES += boat.cpp \
 RESOURCES += subattaq.qrc
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/sub-attaq
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/sub-attaq
 sources.files = $$SOURCES \
     $$HEADERS \
     $$RESOURCES \
     $$FORMS \
     sub-attaq.pro \
     pics
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/sub-attaq
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/sub-attaq
 INSTALLS += target \
     sources

diff --git a/examples/sql/books/books.pro b/examples/sql/books/books.pro
index 1588288..42bb2c2 100644 (file)
--- a/examples/sql/books/books.pro
+++ b/examples/sql/books/books.pro
@@ -8,12 +8,12 @@ FORMS       = bookwindow.ui
 
 QT += sql
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/books
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/books
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/books
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/books
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example
 
 wince*: {
     CONFIG(debug, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll

diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro
index 56e4f89..43f15e5 100644 (file)
--- a/examples/sql/sql.pro
+++ b/examples/sql/sql.pro
@@ -1,6 +1,7 @@
 TEMPLATE      = subdirs
 
-SUBDIRS             =   drilldown
+SUBDIRS             =   books \
+                        drilldown
 !symbian: SUBDIRS   +=  cachedtable \
                         relationaltablemodel \
                         sqlwidgetmapper
@@ -11,6 +12,11 @@ SUBDIRS             =   drilldown
                         querymodel \
                         tablemodel
 
+!cross_compile:{
+    contains(QT_BUILD_PARTS, tools):{
+        SUBDIRS += sqlbrowser
+    }
+}
 
 # install
 sources.files = connection.h sql.pro README

diff --git a/examples/sql/sqlbrowser/sqlbrowser.pro b/examples/sql/sqlbrowser/sqlbrowser.pro
index dc62146..9ec2690 100644 (file)
--- a/examples/sql/sqlbrowser/sqlbrowser.pro
+++ b/examples/sql/sqlbrowser/sqlbrowser.pro
@@ -13,12 +13,12 @@ build_all:!build_pass {
 }
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/sqlbrowser
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/sqlbrowser
 sources.files = $$SOURCES $$HEADERS $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/sqlbrowser
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/sqlbrowser
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example
 
 wince*: {
     DEPLOYMENT_PLUGIN += qsqlite