summaryrefslogtreecommitdiffstats
path: root/doc/src/getting-started
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-09-15 23:45:32 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-09-15 23:45:32 (GMT)
commit4e2163a5c4eec9eeacf8c7260dbf8fb7c74d2b44 (patch)
tree31d86c91c526563302887e756ce5f7876f274223 /doc/src/getting-started
parentadfb5c6160b37a917f20b301366567c208ae52a0 (diff)
parentdcd4b15595a63864ee59a19d80f1ba33b4821aa3 (diff)
downloadQt-4e2163a5c4eec9eeacf8c7260dbf8fb7c74d2b44.zip
Qt-4e2163a5c4eec9eeacf8c7260dbf8fb7c74d2b44.tar.gz
Qt-4e2163a5c4eec9eeacf8c7260dbf8fb7c74d2b44.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/getting-started')
-rw-r--r--doc/src/getting-started/examples.qdoc53
1 files changed, 33 insertions, 20 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 81a8363..1ed1b30 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -1051,7 +1051,7 @@
\previouspage State Machine Examples
\contentspage Qt Examples
- \nextpage Qt for Embedded Linux Examples
+ \nextpage Gestures Examples
\image animation-examples.png Animation
@@ -1066,10 +1066,40 @@
*/
/*!
+ \page examples-gestures.html
+ \title Gestures Examples
+
+ \previouspage Animation Framework Examples
+ \contentspage Qt Examples
+ \nextpage D-Bus Examples
+
+ \list
+ \o \l{gestures/imageviewer}{Image Viewer}
+ \endlist
+*/
+
+/*!
+ \page examples-dbus.html
+ \title D-Bus Examples
+
+ \previouspage Gestures Examples
+ \contentspage Qt Examples
+ \nextpage Qt for Embedded Linux Examples
+
+ \list
+ \o \l{dbus/dbus-chat}{Chat}
+ \o \l{dbus/complexpingpong}{Complex Ping Pong}
+ \o \l{dbus/listnames}{List Names}
+ \o \l{dbus/pingpong}{Ping Pong}
+ \o \l{dbus/remotecontrolledcar}{Remote Controlled Car}
+ \endlist
+*/
+
+/*!
\page examples-embeddedlinux.html
\title Qt for Embedded Linux Examples
- \previouspage Animation Framework Examples
+ \previouspage D-Bus Examples
\contentspage Qt Examples
\nextpage ActiveQt Examples
@@ -1094,7 +1124,7 @@
\previouspage Qt for Embedded Linux Examples
\contentspage Qt Examples
- \nextpage D-Bus Examples
+ \nextpage Qt Quarterly
\image activeqt-examples.png ActiveQt
@@ -1111,20 +1141,3 @@
\o \l{activeqt/wrapper}{Wrapper}\raisedaster
\endlist
*/
-
-/*!
- \page examples-dbus.html
- \title D-Bus Examples
-
- \previouspage ActiveQt Examples
- \contentspage Qt Examples
- \nextpage Qt Quarterly
-
- \list
- \o \l{dbus/dbus-chat}{Chat}
- \o \l{dbus/complexpingpong}{Complex Ping Pong}
- \o \l{dbus/listnames}{List Names}
- \o \l{dbus/pingpong}{Ping Pong}
- \o \l{dbus/remotecontrolledcar}{Remote Controlled Car}
- \endlist
-*/