Move the demos to the examples folder.

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

examples/declarative/declarative.pro

@@ -3,28 +3,38 @@ TEMPLATE = subdirs
 # These examples contain some C++ and need to be built
 SUBDIRS = \
    cppextensions \
+   minehunt \
    modelviews \
-   tutorials \
-   painteditem
+   painteditem \
+   tutorials
 
 # plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name
 symbian:SUBDIRS -= plugins
 
 # These examples contain no C++ and can simply be copied
 sources.files = \
    animation \
+   calculator \
    cppextensions \
+   flickr \
    i18n \
    imageelements \
    keyinteraction \
+   photoviewer \
    positioners \
+   rssnews \
+   samegame \
+   snake \
    sqllocalstorage \
    text \
    threading \
    touchinteraction \
    toys \
+   twitter \
    ui-components \
+   webbrowser \
    xml
 
+
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative
 INSTALLS += sources

qtdeclarative.pro

@@ -7,13 +7,6 @@ module_qtdeclarative_tools.subdir = tools
 module_qtdeclarative_tools.target = module-qtdeclarative-tools
 module_qtdeclarative_tools.depends = module_qtdeclarative_src
 
-module_qtdeclarative_demos.subdir = demos
-module_qtdeclarative_demos.target = module-qtdeclarative-demos
-module_qtdeclarative_demos.depends = module_qtdeclarative_src
-!contains(QT_BUILD_PARTS,demos) {
-    module_qtdeclarative_demos.CONFIG = no_default_target no_default_install
-}
-
 module_qtdeclarative_examples.subdir = examples/declarative
 module_qtdeclarative_examples.target = module-qtdeclarative-examples
 module_qtdeclarative_examples.depends = module_qtdeclarative_src
@@ -29,6 +22,5 @@ module_qtdeclarative_tests.CONFIG = no_default_install
 
 SUBDIRS += module_qtdeclarative_src \
            module_qtdeclarative_tools \
-           module_qtdeclarative_demos \
            module_qtdeclarative_examples \
            module_qtdeclarative_tests \