aboutsummaryrefslogtreecommitdiffstats
path: root/examples/demos
diff options
context:
space:
mode:
Diffstat (limited to 'examples/demos')
-rw-r--r--examples/demos/calculator/calculator.qdoc4
-rw-r--r--examples/demos/clocks/clocks.qdoc37
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.
+*/