Remove references to demos.

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

12 files changed, 19 insertions, 51 deletions

diff --git a/examples/declarative/README b/examples/declarative/README
index 578c2458a6..56c48d71fb 100644
--- a/examples/declarative/README
+++ b/examples/declarative/README
@@ -5,37 +5,9 @@ designers to actually implement their UI vision. QML UIs can integrate
 with C++ code in many ways, including being loaded as a part of a C++ UI
 and loading data models from C++ and interacting with them.
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory. But most can also be viewed directly with the
+Mostof these examples can be viewed directly with the
 QML viewer utility, without requiring compilation.
 
-Documentation for these examples can be found via the Tutorials and Examples
-link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
 
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
+Documentation for these examples can be found via the Examples
+link in the main Qt documentation.
diff --git a/examples/declarative/minehunt/minehunt.pro b/examples/declarative/minehunt/minehunt.pro
index a0220f2dc7..67e25dcfad 100644
--- a/examples/declarative/minehunt/minehunt.pro
+++ b/examples/declarative/minehunt/minehunt.pro
@@ -8,15 +8,15 @@ SOURCES += main.cpp minehunt.cpp
 RESOURCES = minehunt.qrc
 
 sources.files = minehunt.qml minehunt.pro MinehuntCore
-sources.path = $$[QT_INSTALL_DEMOS]/qtdeclarative/declarative/minehunt
-target.path = $$[QT_INSTALL_DEMOS]/qtdeclarative/declarative/minehunt
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/minehunt
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/minehunt
 
 INSTALLS = sources target
 
 symbian:{
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-    CONFIG += qt_demo
+    CONFIG += qt_example
     qmlminehuntfiles.files = MinehuntCore minehunt.qml
     DEPLOYMENT += qmlminehuntfiles
 }
diff --git a/examples/declarative/modelviews/parallax/parallax.qml b/examples/declarative/modelviews/parallax/parallax.qml
index 5fa24adc19..0fdc5e3345 100644
--- a/examples/declarative/modelviews/parallax/parallax.qml
+++ b/examples/declarative/modelviews/parallax/parallax.qml
@@ -70,7 +70,7 @@ Rectangle {
                 anchors { top: parent.top; topMargin: 10; horizontalCenter: parent.horizontalCenter }
                 width: 300; height: 400
                 clip: true; 
-                source: "../../../../demos/declarative/samegame/samegame.qml"
+                source: "../../samegame/samegame.qml"
                 Component.onCompleted: item.inAnotherDemo = true;
             }
         }
diff --git a/examples/declarative/particles/exampleslauncher.qml b/examples/declarative/particles/exampleslauncher.qml
index 54f57654c3..5d2f49e8e1 100644
--- a/examples/declarative/particles/exampleslauncher.qml
+++ b/examples/declarative/particles/exampleslauncher.qml
@@ -52,7 +52,7 @@ Rectangle{
         id: shell
         anchors.fill: parent
     }
-    VisualDataModel{//TODO: Transitions
+    VisualDataModel{//TODO: Transitions between modes
         id: vdm
         model: [
             "../spaceexplorer/spaceexplorer.qml",
@@ -60,8 +60,6 @@ Rectangle{
             "../asteroid/asteroid.qml",
             "../asteroid/blackhole.qml",
             "../custom/blurparticles.qml",
-            "../custom/shader.qml",
-            "../custom/delegates.qml",
             "../modelparticles/bubbles.qml",
             "../modelparticles/gridsplosion.qml",
             "../modelparticles/package.qml",
@@ -83,11 +81,9 @@ Rectangle{
             "../trails/layered.qml",
             "../trails/shimmer.qml",
             "../trails/turbulence.qml",
-            "../trails/combustion.qml",
-            "../trails/fireworks.qml",
-            "../../../../demos/declarative/samegame/samegame.qml",
-            "../../../../demos/declarative/plasmapatrol/plasmapatrol.qml",
-            "../../../../demos/declarative/flickr/flickr.qml"
+            "../../samegame/samegame.qml",
+            "../../plasmapatrol/plasmapatrol.qml",
+            "../../flickr/flickr.qml"
         ]
         delegate: Rectangle{
             color: "white"
diff --git a/examples/declarative/samegame/samegame.qml b/examples/declarative/samegame/samegame.qml
index 0daf72de58..887cfe1cc9 100644
--- a/examples/declarative/samegame/samegame.qml
+++ b/examples/declarative/samegame/samegame.qml
@@ -47,7 +47,7 @@ import "SamegameCore/samegame.js" as Logic
 Rectangle {
     id: screen
     width: 360; height: 640
-    property bool inAnotherDemo: false //Samegame often is just plonked straight into other demos
+    property bool inAnotherDemo: false //Samegame often is just plonked straight into other examples
 
     SystemPalette { id: activePalette }
 
diff --git a/examples/embedded/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro
index 4a82d32227..72f45f56d1 100644
--- a/examples/embedded/qmlcalculator/qmlcalculator.pro
+++ b/examples/embedded/qmlcalculator/qmlcalculator.pro
@@ -6,7 +6,7 @@ include($$PWD/deployment.pri)
 
 symbian {
     TARGET.UID3 = 0x$$qmlcalculator_uid3 # defined in deployment.pri
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
     LIBS += -lcone -leikcore -lavkon # Screen orientation
 }
diff --git a/examples/embedded/qmlclocks/qmlclocks.pro b/examples/embedded/qmlclocks/qmlclocks.pro
index cc97a7394b..1b6cdad6be 100644
--- a/examples/embedded/qmlclocks/qmlclocks.pro
+++ b/examples/embedded/qmlclocks/qmlclocks.pro
@@ -6,7 +6,7 @@ include($$PWD/deployment.pri)
 
 symbian {
     TARGET.UID3 = 0x$$qmlclocks_uid3 # defined in deployment.pri
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
     LIBS += -lcone -leikcore -lavkon # Screen orientation
 }
diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.pro b/examples/embedded/qmldialcontrol/qmldialcontrol.pro
index 348c41a85d..3b2e88649e 100644
--- a/examples/embedded/qmldialcontrol/qmldialcontrol.pro
+++ b/examples/embedded/qmldialcontrol/qmldialcontrol.pro
@@ -6,6 +6,6 @@ include($$PWD/deployment.pri)
 
 symbian {
     TARGET.UID3 = 0x$$qmldialcontrol_uid3 # defined in deployment.pri
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }
diff --git a/examples/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro
index 9d7c8d7d00..bf332aa07d 100644
--- a/examples/embedded/qmleasing/qmleasing.pro
+++ b/examples/embedded/qmleasing/qmleasing.pro
@@ -6,6 +6,6 @@ include($$PWD/deployment.pri)
 
 symbian {
     TARGET.UID3 = 0x$$qmleasing_uid3 # defined in deployment.pri
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }
diff --git a/examples/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro
index a70a6df894..60abe31333 100644
--- a/examples/embedded/qmlflickr/qmlflickr.pro
+++ b/examples/embedded/qmlflickr/qmlflickr.pro
@@ -6,7 +6,7 @@ include($$PWD/deployment.pri)
 
 symbian {
     TARGET.UID3 = 0x$$qmlflickr_uid3 # defined in deployment.pri
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.CAPABILITY = NetworkServices
     # Maximum heap size set to 128 MB in order to allow loading large images.
     TARGET.EPOCHEAPSIZE = 0x20000 0x8000000
diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
index ce6ff552cb..b97bf269d3 100644
--- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
+++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
@@ -6,7 +6,7 @@ include($$PWD/deployment.pri)
 
 symbian {
     TARGET.UID3 = 0x$$qmlphotoviewer_uid3 # defined in deployment.pri
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.CAPABILITY = NetworkServices
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }
diff --git a/examples/embedded/qmltwitter/qmltwitter.pro b/examples/embedded/qmltwitter/qmltwitter.pro
index 197afd3431..79e25de287 100644
--- a/examples/embedded/qmltwitter/qmltwitter.pro
+++ b/examples/embedded/qmltwitter/qmltwitter.pro
@@ -6,7 +6,7 @@ include($$PWD/deployment.pri)
 
 symbian {
     TARGET.UID3 = 0x$$qmltwitter_uid3 # defined in deployment.pri
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.CAPABILITY = NetworkServices
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }