From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 19 Jan 2012 06:03:13 +0000 (+1000)
Subject: Document toys examples
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5781f7f226137634e585197e4f4717748c8a4f76;p=konrad%2Fqtdeclarative.git

Document toys examples

Change-Id: I376c4169ffff19e06b55e578e57101a476500b04
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---

diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/examples/example-slideswitch.qdoc
similarity index 98%
rename from doc/src/declarative/example-slideswitch.qdoc
rename to doc/src/examples/example-slideswitch.qdoc
index 87bc942..83fa568 100644
--- a/doc/src/declarative/example-slideswitch.qdoc
+++ b/doc/src/examples/example-slideswitch.qdoc
@@ -29,6 +29,8 @@
 \page qdeclarativeexampletoggleswitch.html
 \inqmlmodule QtQuick 2
 \title QML Example - Toggle Switch
+\example declarative/ui-components/slideswitch
+\brief A reusable switch component in QML
 
 This example shows how to create a reusable switch component in QML.
 
diff --git a/doc/src/declarative/example-textballoons.qdoc b/doc/src/examples/example-textballoons.qdoc
similarity index 100%
rename from doc/src/declarative/example-textballoons.qdoc
rename to doc/src/examples/example-textballoons.qdoc
diff --git a/doc/src/examples/examples-toys.qdoc b/doc/src/examples/examples-toys.qdoc
new file mode 100644
index 0000000..8f81155
--- /dev/null
+++ b/doc/src/examples/examples-toys.qdoc
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** 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 Example - Calculator
+    \example declarative/calculator
+    \brief This is an example application written in QML.
+    \image qml-calculator-demo-small.png
+*/
+
+/*!
+    \title QML Example - Samegame
+    \example declarative/samegame
+    \brief This example demonstrates creating a game with javascript game logic.
+    \image qml-samegame-demo-small.png
+*/
+
+/*!
+    \title QML Example - Snake
+    \example declarative/snake
+    \brief This example demonstrates creating a game using javascript game logic.
+    \image qml-snake-demo-small.png
+*/
+
+/*!
+    \title QML Example - Corkboards
+    \example declarative/toys/corkboards
+    \brief This example demonstrates using components inside a flickable.
+    \image qml-corkboards-example.png
+*/
+
+/*!
+    \title QML Example - Dynamic Scene
+    \example declarative/toys/dynamicscene
+    \brief This example demonstrates creating components dynamically.
+    \image qml-dynamicscene-example.png
+*/
+
+/*!
+    \title QML Example - Clocks
+    \example declarative/toys/clocks
+    \brief This example demonstrates creating components and using them multiple times.
+    \image qml-clocks-example.png
+*/
diff --git a/doc/src/images/qml-corkboards-example.png b/doc/src/images/qml-corkboards-example.png
new file mode 100644
index 0000000..657ff5c
Binary files /dev/null and b/doc/src/images/qml-corkboards-example.png differ
diff --git a/doc/src/images/qml-dynamicscene-example.png b/doc/src/images/qml-dynamicscene-example.png
new file mode 100644
index 0000000..38260a7
Binary files /dev/null and b/doc/src/images/qml-dynamicscene-example.png differ