From 4c49b03b60ca4a70c8a01b917dbe6ed7a387c7ad Mon Sep 17 00:00:00 2001
From: Casper van Donderen <casper.vandonderen@nokia.com>
Date: Mon, 4 Jul 2011 13:10:27 +0200
Subject: [PATCH] Remove references to demos.
Change-Id: I1799316294deb0595af53f61e541db2ceefed451
Reviewed-on: http://codereview.qt.nokia.com/1147
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
---
doc/config/arthurtext.qdocconf | 4 ++--
doc/config/modules/qtactiveqt.qdocconf | 1 -
doc/config/modules/qtclucene.qdocconf | 1 -
doc/config/modules/qtcore.qdocconf | 1 -
doc/config/modules/qtdeclarative.qdocconf | 1 -
doc/config/modules/qtlocation.qdocconf | 1 -
doc/config/modules/qtmultimedia.qdocconf | 1 -
doc/config/modules/qtphonon.qdocconf | 1 -
doc/config/modules/qtsvg.qdocconf | 1 -
doc/config/modules/qtwebkit-examples-and-demos.qdocconf | 1 -
doc/config/qt-html-templates-online.qdocconf | 2 --
doc/config/qt-html-templates_ja_JP-online.qdocconf | 2 --
doc/config/qt-html-templates_zh_CN-online.qdocconf | 2 --
doc/config/qt-html-templates_zh_CN.qdocconf | 2 --
doc/src/{demos => examples}/anomaly.qdoc | 4 ++--
doc/src/{demos => examples}/arthurplugin.qdoc | 6 +++---
doc/src/{demos => examples}/browser.qdoc | 4 ++--
doc/src/{demos => examples}/guitartuner.qdoc | 4 ++--
doc/src/{demos => examples}/mediaplayer.qdoc | 4 ++--
doc/src/{demos => examples}/mobiledemos.qdoc | 8 ++++----
doc/src/examples/qml-calculator.qdoc | 4 ++--
doc/src/examples/qml-flickr.qdoc | 4 ++--
doc/src/examples/qml-minehunt.qdoc | 4 ++--
doc/src/examples/qml-photoviewer.qdoc | 4 ++--
doc/src/examples/qml-rssnews.qdoc | 4 ++--
doc/src/examples/qml-samegame.qdoc | 4 ++--
doc/src/examples/qml-snake.qdoc | 4 ++--
doc/src/examples/qml-twitter.qdoc | 4 ++--
doc/src/examples/qml-webbrowser.qdoc | 4 ++--
doc/src/{demos => examples}/qtdemo.qdoc | 4 ++--
doc/src/{demos => examples}/spectrum.qdoc | 6 +++---
31 files changed, 40 insertions(+), 57 deletions(-)
rename doc/src/{demos => examples}/anomaly.qdoc (92%)
rename doc/src/{demos => examples}/arthurplugin.qdoc (87%)
rename doc/src/{demos => examples}/browser.qdoc (91%)
rename doc/src/{demos => examples}/guitartuner.qdoc (94%)
rename doc/src/{demos => examples}/mediaplayer.qdoc (90%)
rename doc/src/{demos => examples}/mobiledemos.qdoc (83%)
rename doc/src/{demos => examples}/qtdemo.qdoc (93%)
rename doc/src/{demos => examples}/spectrum.qdoc (91%)
diff --git a/doc/config/arthurtext.qdocconf b/doc/config/arthurtext.qdocconf
index 473152de..dc6b72cb 100644
--- a/doc/config/arthurtext.qdocconf
+++ b/doc/config/arthurtext.qdocconf
@@ -2,5 +2,5 @@ include(qt.qdocconf)
headerdirs =
sourcedirs =
sources = $QTDIR/doc/src/qt4-arthur.qdoc
-outputdir = $QTDIR/demos/arthur/html
-HTML.{postheader,address} = ""
\ No newline at end of file
+outputdir = $QTDIR/qtdoc/examples/arthur/html
+HTML.{postheader,address} = ""
diff --git a/doc/config/modules/qtactiveqt.qdocconf b/doc/config/modules/qtactiveqt.qdocconf
index 281c85fe..bb706884 100644
--- a/doc/config/modules/qtactiveqt.qdocconf
+++ b/doc/config/modules/qtactiveqt.qdocconf
@@ -6,7 +6,6 @@ sourcedirs += $QT_ACTIVEQT_SOURCES/.. \
$QT_ACTIVEQT_SOURCES/../../tools
exampledirs += $QT_ACTIVEQT_SOURCES/../.. \
- $QT_ACTIVEQT_SOURCES/../../demos \
$QT_ACTIVEQT_SOURCES/../../doc/src \
$QT_ACTIVEQT_SOURCES/../../examples
diff --git a/doc/config/modules/qtclucene.qdocconf b/doc/config/modules/qtclucene.qdocconf
index 59fdd6ac..d058067d 100644
--- a/doc/config/modules/qtclucene.qdocconf
+++ b/doc/config/modules/qtclucene.qdocconf
@@ -6,7 +6,6 @@ sourcedirs += $QT_CLUCENE_SOURCES/../../.. \
$QT_CLUCENE_SOURCES/../../../../doc/src
exampledirs += $QT_CLUCENE_SOURCES/../../../.. \
- $QT_CLUCENE_SOURCES/../../../../demos \
$QT_CLUCENE_SOURCES/../../../../doc/src \
$QT_CLUCENE_SOURCES/../../../../examples
diff --git a/doc/config/modules/qtcore.qdocconf b/doc/config/modules/qtcore.qdocconf
index 15e5c30b..046181c8 100644
--- a/doc/config/modules/qtcore.qdocconf
+++ b/doc/config/modules/qtcore.qdocconf
@@ -6,7 +6,6 @@ sourcedirs += $QT_CORE_SOURCES/.. \
$QT_CORE_SOURCES/../../tools
exampledirs += $QT_CORE_SOURCES/../.. \
- $QT_CORE_SOURCES/../../demos \
$QT_CORE_SOURCES/../../doc/src \
$QT_CORE_SOURCES/../../examples
diff --git a/doc/config/modules/qtdeclarative.qdocconf b/doc/config/modules/qtdeclarative.qdocconf
index bcc99a2c..f60e44fb 100644
--- a/doc/config/modules/qtdeclarative.qdocconf
+++ b/doc/config/modules/qtdeclarative.qdocconf
@@ -6,7 +6,6 @@ sourcedirs += $QT_DECLARATIVE_SOURCES/.. \
$QT_DECLARATIVE_SOURCES/../../tools
exampledirs += $QT_DECLARATIVE_SOURCES/../.. \
- $QT_DECLARATIVE_SOURCES/../../demos \
$QT_DECLARATIVE_SOURCES/../../doc/src \
$QT_DECLARATIVE_SOURCES/../../examples
diff --git a/doc/config/modules/qtlocation.qdocconf b/doc/config/modules/qtlocation.qdocconf
index bba96e50..efddc93f 100644
--- a/doc/config/modules/qtlocation.qdocconf
+++ b/doc/config/modules/qtlocation.qdocconf
@@ -4,7 +4,6 @@ sourcedirs += $QT_LOCATION_SOURCES \
$QT_LOCATION_SOURCES/../../doc/src
exampledirs += $QT_LOCATION_SOURCES/../.. \
- $QT_LOCATION_SOURCES/../../demos \
$QT_LOCATION_SOURCES/../../doc/src \
$QT_LOCATION_SOURCES/../../examples
diff --git a/doc/config/modules/qtmultimedia.qdocconf b/doc/config/modules/qtmultimedia.qdocconf
index 0e42b01a..adaede56 100644
--- a/doc/config/modules/qtmultimedia.qdocconf
+++ b/doc/config/modules/qtmultimedia.qdocconf
@@ -4,7 +4,6 @@ sourcedirs += $QT_MULTIMEDIA_SOURCES/.. \
$QT_MULTIMEDIA_SOURCES/../../doc/src
exampledirs += $QT_MULTIMEDIA_SOURCES/../.. \
- $QT_MULTIMEDIA_SOURCES/../../demos \
$QT_MULTIMEDIA_SOURCES/../../doc/src \
$QT_MULTIMEDIA_SOURCES/../../examples
diff --git a/doc/config/modules/qtphonon.qdocconf b/doc/config/modules/qtphonon.qdocconf
index 18032f20..a4ddf264 100644
--- a/doc/config/modules/qtphonon.qdocconf
+++ b/doc/config/modules/qtphonon.qdocconf
@@ -4,7 +4,6 @@ sourcedirs += $QT_PHONON_SOURCES/.. \
$QT_PHONON_SOURCES/../../../../doc/src
exampledirs += $QT_PHONON_SOURCES/../../../.. \
- $QT_PHONON_SOURCES/../../../../demos \
$QT_PHONON_SOURCES/../../../../doc/src \
$QT_PHONON_SOURCES/../../../../examples
diff --git a/doc/config/modules/qtsvg.qdocconf b/doc/config/modules/qtsvg.qdocconf
index 1816f772..ca78303d 100644
--- a/doc/config/modules/qtsvg.qdocconf
+++ b/doc/config/modules/qtsvg.qdocconf
@@ -4,7 +4,6 @@ sourcedirs += $QT_SVG_SOURCES/.. \
$QT_SVG_SOURCES/../../doc/src
exampledirs += $QT_SVG_SOURCES/../.. \
- $QT_SVG_SOURCES/../../demos \
$QT_SVG_SOURCES/../../doc/src \
$QT_SVG_SOURCES/../../examples
diff --git a/doc/config/modules/qtwebkit-examples-and-demos.qdocconf b/doc/config/modules/qtwebkit-examples-and-demos.qdocconf
index 23c01d2a..fd13527d 100644
--- a/doc/config/modules/qtwebkit-examples-and-demos.qdocconf
+++ b/doc/config/modules/qtwebkit-examples-and-demos.qdocconf
@@ -3,7 +3,6 @@ headerdirs +=
sourcedirs += $QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES/doc/src
exampledirs += $QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES \
- $QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES/demos \
$QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES/doc/src \
$QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES/examples
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
index aabaf0f3..dbaecb46 100644
--- a/doc/config/qt-html-templates-online.qdocconf
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -49,7 +49,6 @@ HTML.postheader = \
" <ul> \n" \
" <li><a href=\"all-examples.html\">Examples</a></li> \n" \
" <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
- " <li><a href=\"demos.html\">Demos</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
" </ul> \n" \
" </li> \n" \
@@ -113,7 +112,6 @@ HTML.postheader = \
" <ul id=\"ul003\">\n" \
" <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
" </ul> \n" \
" </div>\n" \
diff --git a/doc/config/qt-html-templates_ja_JP-online.qdocconf b/doc/config/qt-html-templates_ja_JP-online.qdocconf
index 8dc17af7..d0494b95 100644
--- a/doc/config/qt-html-templates_ja_JP-online.qdocconf
+++ b/doc/config/qt-html-templates_ja_JP-online.qdocconf
@@ -52,7 +52,6 @@ HTML.postheader = \
" <ul id=\"topmenuexample\"> \n" \
" <li><a href=\"all-examples.html\">Examples</a></li> \n" \
" <li><a href=\"tutorials.html\">ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«</a></li> \n" \
- " <li><a href=\"demos.html\">Demos</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
" </ul> \n" \
@@ -108,7 +107,6 @@ HTML.postheader = \
" <ul id=\"ul003\">\n" \
" <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"tutorials.html\">ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
" </ul> \n" \
diff --git a/doc/config/qt-html-templates_zh_CN-online.qdocconf b/doc/config/qt-html-templates_zh_CN-online.qdocconf
index e7e82209..c85ace8e 100644
--- a/doc/config/qt-html-templates_zh_CN-online.qdocconf
+++ b/doc/config/qt-html-templates_zh_CN-online.qdocconf
@@ -52,7 +52,6 @@ HTML.postheader = \
" <ul id=\"topmenuexample\"> \n" \
" <li><a href=\"all-examples.html\">Examples</a></li> \n" \
" <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
- " <li><a href=\"demos.html\">Demos</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
" </ul> \n" \
@@ -108,7 +107,6 @@ HTML.postheader = \
" <ul id=\"ul003\">\n" \
" <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
" </ul> \n" \
diff --git a/doc/config/qt-html-templates_zh_CN.qdocconf b/doc/config/qt-html-templates_zh_CN.qdocconf
index b4c8f7b1..0bbd3070 100644
--- a/doc/config/qt-html-templates_zh_CN.qdocconf
+++ b/doc/config/qt-html-templates_zh_CN.qdocconf
@@ -52,7 +52,6 @@ HTML.postheader = \
" <ul id=\"topmenuexample\"> \n" \
" <li><a href=\"all-examples.html\">Examples</a></li> \n" \
" <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
- " <li><a href=\"demos.html\">Demos</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
" </ul> \n" \
@@ -108,7 +107,6 @@ HTML.postheader = \
" <ul id=\"ul003\">\n" \
" <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
" </ul> \n" \
diff --git a/doc/src/demos/anomaly.qdoc b/doc/src/examples/anomaly.qdoc
similarity index 92%
rename from doc/src/demos/anomaly.qdoc
rename to doc/src/examples/anomaly.qdoc
index 9d19099a..54ce8155 100644
--- a/doc/src/demos/anomaly.qdoc
+++ b/doc/src/examples/anomaly.qdoc
@@ -26,8 +26,8 @@
****************************************************************************/
/*!
- \example demos/embedded/anomaly
- \title Anomaly Demonstration
+ \example embedded/anomaly
+ \title Anomaly
\image anomaly-demo.png
*/
diff --git a/doc/src/demos/arthurplugin.qdoc b/doc/src/examples/arthurplugin.qdoc
similarity index 87%
rename from doc/src/demos/arthurplugin.qdoc
rename to doc/src/examples/arthurplugin.qdoc
index c5daf183..76e55a28 100644
--- a/doc/src/demos/arthurplugin.qdoc
+++ b/doc/src/examples/arthurplugin.qdoc
@@ -26,15 +26,15 @@
****************************************************************************/
/*!
- \example demos/arthurplugin
+ \example painting/arthurplugin
\title Arthur Plugin
- In this demo we demonstrate the abilities of Qt's painting system
+ In this example we demonstrate the abilities of Qt's painting system
in combination with \QD's custom widget plugin facilities.
\image arthurplugin-demo.png
- The specialized widgets used in the other demonstrations of the Arthur
+ The specialized widgets used in the other examples of the Arthur
painting system are provided as custom widgets to be used with \QD.
Since each of the widgets provides a set of signals and slots, the
effects they show can be controlled by connecting them up to standard
diff --git a/doc/src/demos/browser.qdoc b/doc/src/examples/browser.qdoc
similarity index 91%
rename from doc/src/demos/browser.qdoc
rename to doc/src/examples/browser.qdoc
index 2cfc933a..6c9d075e 100644
--- a/doc/src/demos/browser.qdoc
+++ b/doc/src/examples/browser.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \page demos-browser.html
+ \page examples-browser.html
\title Web Browser
- The Web Browser demonstration shows Qt's WebKit module in action,
+ The Web Browser example shows Qt's WebKit module in action,
providing a little Web browser application.
\image browser-demo.png
diff --git a/doc/src/demos/guitartuner.qdoc b/doc/src/examples/guitartuner.qdoc
similarity index 94%
rename from doc/src/demos/guitartuner.qdoc
rename to doc/src/examples/guitartuner.qdoc
index df15c043..2c22404b 100644
--- a/doc/src/demos/guitartuner.qdoc
+++ b/doc/src/examples/guitartuner.qdoc
@@ -28,7 +28,7 @@
/*!
\page guitartuner_example.html
\title Guitar Tuner Example
- \example demos/mobile/guitartuner
+ \example mobile/guitartuner
The Guitar Tuner application can be used to tune guitar strings by analyzing the
audio recorded by the device microphone. Guitar Tuner can be also used in the
@@ -40,6 +40,6 @@ code to the Qt Quick UI.
The example is hosted in Projects Forum Nokia: https://projects.forum.nokia.com/guitartuner
-\note This demonstration requires QtMobility libraries.
+\note This example requires QtMobility libraries.
\image qml-guitartuner-example.png
*/
diff --git a/doc/src/demos/mediaplayer.qdoc b/doc/src/examples/mediaplayer.qdoc
similarity index 90%
rename from doc/src/demos/mediaplayer.qdoc
rename to doc/src/examples/mediaplayer.qdoc
index 8f35ee51..3d411e35 100644
--- a/doc/src/demos/mediaplayer.qdoc
+++ b/doc/src/examples/mediaplayer.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/qmediaplayer
+ \example phonon/qmediaplayer
\title Media Player
- The Media Player demonstration shows how \l{Phonon Module}{Phonon}
+ The Media Player example shows how \l{Phonon Module}{Phonon}
can be used in Qt applications to handle audio and video playback.
\image qmediaplayer-demo.png
diff --git a/doc/src/demos/mobiledemos.qdoc b/doc/src/examples/mobiledemos.qdoc
similarity index 83%
rename from doc/src/demos/mobiledemos.qdoc
rename to doc/src/examples/mobiledemos.qdoc
index 2aaa2584..28228982 100644
--- a/doc/src/demos/mobiledemos.qdoc
+++ b/doc/src/examples/mobiledemos.qdoc
@@ -27,14 +27,14 @@
/*!
- \example demos/mobile/quickhit
- \title Quick Hit Demo
+ \example mobile/quickhit
+ \title Quick Hit Example
- This demo shows how to use Mobility APIs to access device audio
+ This example shows how to use Mobility APIs to access device audio
capabilities. Uses the multimedia and systeminfo modules of
\l{external: Qt Mobility Manual}{Qt Mobility}.
- \note This demonstration requires QtMobility libraries.
+ \note This example requires QtMobility libraries.
*/
diff --git a/doc/src/examples/qml-calculator.qdoc b/doc/src/examples/qml-calculator.qdoc
index 0624cb4f..2fda7926 100644
--- a/doc/src/examples/qml-calculator.qdoc
+++ b/doc/src/examples/qml-calculator.qdoc
@@ -27,9 +27,9 @@
/*!
\title Calculator
- \example demos/declarative/calculator
+ \example declarative/calculator
- This demo shows how to write a simple calculator application in QML and JavaScript.
+ This example shows how to write a simple calculator application in QML and JavaScript.
\image qml-calculator-example.png
*/
diff --git a/doc/src/examples/qml-flickr.qdoc b/doc/src/examples/qml-flickr.qdoc
index c23c0ba0..7e4fd5ec 100644
--- a/doc/src/examples/qml-flickr.qdoc
+++ b/doc/src/examples/qml-flickr.qdoc
@@ -27,9 +27,9 @@
/*!
\title Flickr Mobile
- \example demos/declarative/flickr
+ \example declarative/flickr
- This demo shows how to write a mobile Flickr browser application in QML.
+ This example shows how to write a mobile Flickr browser application in QML.
\image qml-flickr-demo.png
*/
diff --git a/doc/src/examples/qml-minehunt.qdoc b/doc/src/examples/qml-minehunt.qdoc
index ac13456e..8b0033c0 100644
--- a/doc/src/examples/qml-minehunt.qdoc
+++ b/doc/src/examples/qml-minehunt.qdoc
@@ -27,9 +27,9 @@
/*!
\title Minehunt
- \example demos/declarative/minehunt
+ \example declarative/minehunt
- This demo shows how to create a simple Minehunt game, using QML for the
+ This example shows how to create a simple Minehunt game, using QML for the
UI and C++ for the game logic.
\image qml-minehunt-demo.png
diff --git a/doc/src/examples/qml-photoviewer.qdoc b/doc/src/examples/qml-photoviewer.qdoc
index 5ecbf842..a8659b2b 100644
--- a/doc/src/examples/qml-photoviewer.qdoc
+++ b/doc/src/examples/qml-photoviewer.qdoc
@@ -27,9 +27,9 @@
/*!
\title Photo Viewer
- \example demos/declarative/photoviewer
+ \example declarative/photoviewer
- This demo shows how to write a Flickr photo viewer application in QML.
+ This example shows how to write a Flickr photo viewer application in QML.
\image qml-photoviewer-demo.png
*/
diff --git a/doc/src/examples/qml-rssnews.qdoc b/doc/src/examples/qml-rssnews.qdoc
index beea4d34..b8936152 100644
--- a/doc/src/examples/qml-rssnews.qdoc
+++ b/doc/src/examples/qml-rssnews.qdoc
@@ -27,9 +27,9 @@
/*!
\title RSS News
- \example demos/declarative/rssnews
+ \example declarative/rssnews
- This demo shows how to write a RSS news reader in QML.
+ This example shows how to write a RSS news reader in QML.
\image qml-rssnews-demo.png
*/
diff --git a/doc/src/examples/qml-samegame.qdoc b/doc/src/examples/qml-samegame.qdoc
index 81a26a3a..4c9ccf45 100644
--- a/doc/src/examples/qml-samegame.qdoc
+++ b/doc/src/examples/qml-samegame.qdoc
@@ -27,9 +27,9 @@
/*!
\title Same Game
- \example demos/declarative/samegame
+ \example declarative/samegame
- This demo shows how to write a 'Same Game' game in QML, using Javascript
+ This example shows how to write a 'Same Game' game in QML, using Javascript
for all the game logic.
\image qml-samegame-demo.png
diff --git a/doc/src/examples/qml-snake.qdoc b/doc/src/examples/qml-snake.qdoc
index bce0e710..d4cdaf56 100644
--- a/doc/src/examples/qml-snake.qdoc
+++ b/doc/src/examples/qml-snake.qdoc
@@ -27,9 +27,9 @@
/*!
\title Snake
- \example demos/declarative/snake
+ \example declarative/snake
- This demo shows how to write a Snake game in QML, controlled by the
+ This example shows how to write a Snake game in QML, controlled by the
keyboard as well as the mouse.
\image qml-snake-demo.png
diff --git a/doc/src/examples/qml-twitter.qdoc b/doc/src/examples/qml-twitter.qdoc
index 3ebabb45..7f2e9a6b 100644
--- a/doc/src/examples/qml-twitter.qdoc
+++ b/doc/src/examples/qml-twitter.qdoc
@@ -27,9 +27,9 @@
/*!
\title Twitter Mobile
- \example demos/declarative/twitter
+ \example declarative/twitter
- This demo shows how to write a mobile Twitter search client in QML. Use it to
+ This example shows how to write a mobile Twitter search client in QML. Use it to
see what people think about Qt Quick!
\image qml-twitter-demo.png
diff --git a/doc/src/examples/qml-webbrowser.qdoc b/doc/src/examples/qml-webbrowser.qdoc
index 08416af1..48eadfe4 100644
--- a/doc/src/examples/qml-webbrowser.qdoc
+++ b/doc/src/examples/qml-webbrowser.qdoc
@@ -27,9 +27,9 @@
/*!
\title QML Web Browser
- \example demos/declarative/webbrowser
+ \example declarative/webbrowser
- This demo shows how to write a simple web browser in QML by combining the
+ This example shows how to write a simple web browser in QML by combining the
WebView element with other components including scroll bars,
\l Flickable views and TextInput fields.
diff --git a/doc/src/demos/qtdemo.qdoc b/doc/src/examples/qtdemo.qdoc
similarity index 93%
rename from doc/src/demos/qtdemo.qdoc
rename to doc/src/examples/qtdemo.qdoc
index f4d3cbf1..0f25bcb9 100644
--- a/doc/src/demos/qtdemo.qdoc
+++ b/doc/src/examples/qtdemo.qdoc
@@ -27,11 +27,11 @@
/*!
\page qtdemo.html
- \title Examples and Demos Launcher
+ \title Examples Launcher
\ingroup qttools
\keyword qtdemo
- The Examples and Demos Launcher (\c qtdemo) allows the user to browse the
+ The Examples Launcher (\c qtdemo) allows the user to browse the
examples and demonstrations included with Qt, access the documentation
associated with each of them, and launch them as separate applications.
diff --git a/doc/src/demos/spectrum.qdoc b/doc/src/examples/spectrum.qdoc
similarity index 91%
rename from doc/src/demos/spectrum.qdoc
rename to doc/src/examples/spectrum.qdoc
index 7e984264..7c038f04 100644
--- a/doc/src/demos/spectrum.qdoc
+++ b/doc/src/examples/spectrum.qdoc
@@ -26,17 +26,17 @@
****************************************************************************/
/*!
- \example demos/spectrum
+ \example multimedia/spectrum
\title Spectrum Analyzer
- The Spectrum Analyzer demo shows how the \l{QtMultimedia Module} can be
+ The Spectrum Analyzer example shows how the \l{QtMultimedia Module} can be
used in Qt applications to capture and then play back an audio stream.
\image spectrum-demo.png
Because QtMultimedia allows the application to access the raw audio
stream, the data can either be inspected or modified by the application.
- The Spectrum Analyzer demo displays three pieces of information while
+ The Spectrum Analyzer example displays three pieces of information while
audio is being either captured or played back:
\list
--
GitLab