aboutsummaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-01-19 16:03:13 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-20 15:13:15 +0100
commit5781f7f226137634e585197e4f4717748c8a4f76 (patch)
treef95edce2b63584490384db3138595aa90f8ce975 /doc/src
parent95a92ae3881ee99a851b69c96fc2c3c985a0a0ed (diff)
Document toys examples
Change-Id: I376c4169ffff19e06b55e578e57101a476500b04 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/examples/example-slideswitch.qdoc (renamed from doc/src/declarative/example-slideswitch.qdoc)2
-rw-r--r--doc/src/examples/example-textballoons.qdoc (renamed from doc/src/declarative/example-textballoons.qdoc)0
-rw-r--r--doc/src/examples/examples-toys.qdoc69
-rw-r--r--doc/src/images/qml-corkboards-example.pngbin0 -> 615192 bytes
-rw-r--r--doc/src/images/qml-dynamicscene-example.pngbin0 -> 32286 bytes
5 files changed, 71 insertions, 0 deletions
diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/examples/example-slideswitch.qdoc
index 87bc942c79..83fa568f98 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
index e475cf15bd..e475cf15bd 100644
--- a/doc/src/declarative/example-textballoons.qdoc
+++ b/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 0000000000..8f81155b73
--- /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 0000000000..657ff5cb17
--- /dev/null
+++ b/doc/src/images/qml-corkboards-example.png
Binary files differ
diff --git a/doc/src/images/qml-dynamicscene-example.png b/doc/src/images/qml-dynamicscene-example.png
new file mode 100644
index 0000000000..38260a7d3f
--- /dev/null
+++ b/doc/src/images/qml-dynamicscene-example.png
Binary files differ