summaryrefslogtreecommitdiffstats
path: root/doc/src/getting-started/demos.qdoc
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-11-25 18:20:45 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-11-25 18:20:45 (GMT)
commite58b7f0cc139c5fda3d472c38161be8fb718db7d (patch)
tree3c20cccfe050d125a5f4736ba11b6383e8734be4 /doc/src/getting-started/demos.qdoc
parentc2a4a1b1e06f8b0d02e7b56c9eb0c19fd2fae80a (diff)
parent4c3539dfbc65d5decdd842d4181f9aa3d38d213c (diff)
downloadQt-e58b7f0cc139c5fda3d472c38161be8fb718db7d.zip
Qt-e58b7f0cc139c5fda3d472c38161be8fb718db7d.tar.gz
Qt-e58b7f0cc139c5fda3d472c38161be8fb718db7d.tar.bz2
Merge branch '4.6'
Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
Diffstat (limited to 'doc/src/getting-started/demos.qdoc')
-rw-r--r--doc/src/getting-started/demos.qdoc27
1 files changed, 27 insertions, 0 deletions
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 4527c2b..35654d2 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -163,4 +163,31 @@
\note The Phonon demos are currently not available for the MinGW platform.
+ \section1 Animation
+
+ \list
+ \o \l{demos/sub-attaq}{Sub-Attaq} demonstrates the features of the
+ \l{The Animation Framework}{animation framework} and
+ \l{The State Machine Framework}{state machine framework} in the production of
+ a simple game.
+ \endlist
+
+ \section1 Embedded Platforms
+
+ \list
+ \o \l{demos/embedded/anomaly}{Anomaly} is a small screen browser with kinetic scrolling.
+ \o \l{demos/embedded/desktopservices}{Embedded Desktop Services} shows how to open
+ documents using the applications associated with their file types.
+ \o \l{demos/embedded/digiflip}{Digiflip} is a digital watch with transition effects.
+ \o \l{demos/embedded/embeddedsvgviewer}{Embedded SVG Viewer} shows how to display SVG
+ drawings on embedded devices.
+ \o \l{demos/embedded/flickable}{Flickable List} shows how to display a list with kinetic scrolling.
+ \o \l{demos/embedded/flightinfo}{Flight Info} fetches information about aircraft flights from the Web.
+ \o \l{demos/embedded/fluidlauncher}{Fluid Launcher} demo application launcher for embedded screens
+ \o \l{demos/embedded/lightmaps}{Light Maps} demonstrates OpenStreetMap integration with WebKit.
+ \o \l{demos/embedded/raycasting}{Ray Casting} demonstrates the use of ray casting with the
+ \l{The Graphics View Framework}{Graphics View} framework.
+ \o \l{demos/embedded/styledemo}{Embedded Styles} demonstrates the use of styles.
+ \o \l{demos/embedded/weatherinfo}{Weather Info} fetches weather information from the Web.
+ \endlist
*/