diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-03-20 17:57:07 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-28 05:49:28 +0200 |
| commit | 1025b77fe09f010be71ac460475da144e742bf09 (patch) | |
| tree | 4e3496b305895948c2d16abe6a6f30b363153fa0 /examples/demos | |
| parent | a3d4c97c5fb28599e007116fec679b16656df512 (diff) | |
Tidy up examples documentation
Add missing doc images, move documentation into examples directory, and
update example doc references to the new locations (quick/qml instead of
declarative or qtquick).
Change-Id: I67a9302f2b451b8bf30f4ca6b625f54b240da429
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'examples/demos')
| -rw-r--r-- | examples/demos/calculator/calculator.qdoc | 4 | ||||
| -rw-r--r-- | examples/demos/clocks/clocks.qdoc | 37 |
2 files changed, 39 insertions, 2 deletions
diff --git a/examples/demos/calculator/calculator.qdoc b/examples/demos/calculator/calculator.qdoc index e94bdb4cfd..793948703e 100644 --- a/examples/demos/calculator/calculator.qdoc +++ b/examples/demos/calculator/calculator.qdoc @@ -27,9 +27,9 @@ /*! \title QML Demo - Calculator - \example declarative/calculator + \example demos/calculator \brief This is an example calculator application written in QML. - \image qml-calculator-demo-small.png + \image qml-calculator-example-small.png The Calculator demo implements a simple calculator in QML. It is written for desktop and portrait devices, although on device it supports orientation changes. diff --git a/examples/demos/clocks/clocks.qdoc b/examples/demos/clocks/clocks.qdoc new file mode 100644 index 0000000000..54479bae17 --- /dev/null +++ b/examples/demos/clocks/clocks.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title QML Demo - Clocks + \example demos/clocks + \brief This example demonstrates creating components and using them multiple times. + \image qml-clocks-example.png + + This demo give a simple world clock application, containing multiple clocks from around the world. + + In doing this, it reuses a signle Clock component with some slight changes to the parameters. +*/ |