summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-05-18 07:43:20 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-05-18 07:45:10 (GMT)
commitf4492bf01baae353ff63da18a9a602fb3a8058e4 (patch)
treedd26f922483ad4905cb2b0b38d2b9097dbf6178c /doc
parentba9218a9786abddd461034b5aeb1d5a39f8072f9 (diff)
downloadQt-f4492bf01baae353ff63da18a9a602fb3a8058e4.zip
Qt-f4492bf01baae353ff63da18a9a602fb3a8058e4.tar.gz
Qt-f4492bf01baae353ff63da18a9a602fb3a8058e4.tar.bz2
Rename some examples: proxyviewer -> networkaccessmanagerfactory,
proxywidgets -> qwidgets, dynamic -> dynamicscene, velocity -> corkboards
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/examples.qdoc8
-rw-r--r--doc/src/examples/qml-examples.qdoc24
2 files changed, 16 insertions, 16 deletions
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index a65614e..4ad57f2 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -139,20 +139,20 @@ For example, from your build directory, run:
\list
\o \l{declarative/cppextensions/referenceexamples}{Reference examples} (discussed in \l {Extending QML in C++})
\o \l{declarative/cppextensions/plugins}{Plugins}
-\o \l{declarative/cppextensions/proxywidgets}{QtWidgets}
\o \l{declarative/cppextensions/qgraphicslayouts}{QGraphicsLayouts}
+\o \l{declarative/cppextensions/qwidgets}{QWidgets}
\o \l{declarative/cppextensions/imageprovider}{Image provider}
-\o \l{declarative/cppextensions/proxyviewer}{Network access manager factory}
+\o \l{declarative/cppextensions/networkaccessmanagerfactory}{Network access manager factory}
\endlist
\section2 Toys
\list
\o \l{declarative/toys/clocks}{Clocks}
+\o \l{declarative/toys/corkboards}{Corkboards}
\o \l{declarative/toys/dial}{Dial}
-\o \l{declarative/toys/dynamic}{Dynamic}
+\o \l{declarative/toys/dynamicscene}{Dynamic Scene}
\o \l{declarative/toys/tic-tac-toe}{Tic Tac Toe}
\o \l{declarative/toys/tvtennis}{TV Tennis}
-\o \l{declarative/toys/velocity}{Velocity}
\endlist
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index cad713e..2973d8c 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -88,13 +88,13 @@
*/
/*!
- \title QtWidgets
- \example declarative/cppextensions/proxywidgets
+ \title QGraphicsLayouts
+ \example declarative/cppextensions/qgraphicslayouts
*/
/*!
- \title QGraphicsLayouts
- \example declarative/cppextensions/qgraphicslayouts
+ \title QWidgets
+ \example declarative/cppextensions/qwidgets
*/
/*!
@@ -104,7 +104,7 @@
/*!
\title Network access manager
- \example declarative/cppextensions/proxyviewer
+ \example declarative/cppextensions/networkaccessmanagerfactory
*/
/*!
@@ -192,6 +192,11 @@
*/
/*!
+ \title Corkboards
+ \example declarative/toys/corkboards
+*/
+
+/*!
\title Dial
\example declarative/toys/dial
@@ -199,8 +204,8 @@
*/
/*!
- \title Dynamic
- \example declarative/toys/dynamic
+ \title Dynamic Scene
+ \example declarative/toys/dynamicscene
This example shows how to create dynamic objects QML.
*/
@@ -216,11 +221,6 @@
*/
/*!
- \title Velocity
- \example declarative/toys/velocity
-*/
-
-/*!
\title Gestures
\example declarative/touchinteraction/gestures
*/