summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/examples.qdoc51
-rw-r--r--doc/src/declarative/pics/dial-example.gifbin0 -> 566465 bytes
-rw-r--r--doc/src/declarative/pics/switch-example.gifbin0 -> 25270 bytes
-rw-r--r--doc/src/declarative/qtdeclarative.qdoc6
4 files changed, 47 insertions, 10 deletions
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 7a03685..9d66089 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -41,7 +41,9 @@
/*!
\page qmlexamples.html
-\title QML Examples
+\title QML Examples and Walkthroughs
+
+\section1 Running Examples
A \l {qmlviewer}{viewer} application is included that allows you to quickly explore many of the
examples. It has some useful options, revealed by:
@@ -63,12 +65,47 @@ or
Many other simple examples can be found under the \c examples/declarative sub
directory. Some can be run directly using the viewer like those above, and
-others require you to build and run an executable.
+others require you to build and run an executable. More sophisticated demos of
+large applications can be found under the \c demos/declarative sub directory.
+These are intended to show more integrated functionality rather than to be
+instructive on specific elements.
+
+\section1 Examples
+
+These will be documented, and demonstrate how to achieve various things in QML.
-More sophisticated demos of large applications can be found under the \c demos/declarative
-sub directory. These are intended to show more integrated functionality rather than
-to be instructive on specific elements.
+\raw HTML
+<center>
+<table cellspacing="10">
+<tr>
+<td>
+\endraw
+\image dial-example.gif
+\raw HTML
+</td>
+<td>
+\endraw
+\image switch-example.gif
+\raw HTML
+</td>
+<td>
+\endraw
+\image declarative-adv-tutorial4.gif
+\raw HTML
+</td>
+</tr>
+<tr>
+<td>
+<center>Elastic Dial</center>
+</td>
+<td>
+<center>Touch Toggle Switch</center>
+</td>
+<td>
+<center>Samegame</center>
+</td>
+</table>
+</center>
+\endraw
-Finally, check out the \l {tutorial} to learn a little more about writing your
-own QML-based applications.
*/
diff --git a/doc/src/declarative/pics/dial-example.gif b/doc/src/declarative/pics/dial-example.gif
new file mode 100644
index 0000000..4e90ba9
--- /dev/null
+++ b/doc/src/declarative/pics/dial-example.gif
Binary files differ
diff --git a/doc/src/declarative/pics/switch-example.gif b/doc/src/declarative/pics/switch-example.gif
new file mode 100644
index 0000000..3d6582f
--- /dev/null
+++ b/doc/src/declarative/pics/switch-example.gif
Binary files differ
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index bd50034..73814db 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -62,7 +62,7 @@ existing QObject based type system, adds support for automatic
level.
The \l {QML Elements} are a sophisticated set of graphical and behavioral building
-blocks. \l {QML Elements} are combined together in QML files to build components
+blocks. \l {QML Elements} are combined together in \l {QML Documents} to build components
ranging in complexity from simple pushbuttons and sliders, to complete
internet-enabled applications like a \l {http://www.flickr.com}{flickr} photo browser.
@@ -73,10 +73,10 @@ completely new applications. QML is fully \l {Extending QML}{extensible from C+
\section1 Getting Started:
\list
\o \l {Introduction to the QML language}
-\o \l {tutorial}{Tutorial: 'Hello World'}
+\o \l {Tutorial}{Tutorial: 'Hello World'}
\o \l {tutorials-declarative-contacts.html}{Tutorial: 'Introduction to QML'}
\o \l {advtutorial.html}{Advanced Tutorial: 'Same Game'}
-\o \l {QML Examples}
+\o \l {QML Examples and Walkthroughs}
\endlist
\section1 Core QML Features: