summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/tutorial.qdoc
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-05-05 15:41:08 +1000
committerBea Lam <bea.lam@nokia.com>2010-05-05 15:42:23 +1000
commitdc4f8e4b23a4b07efe1605c2ae479e219b456df9 (patch)
tree6a89a3d663297711294ab7ffd058fe5fb5a71d58 /doc/src/declarative/tutorial.qdoc
parent06c8e20cd7c04c5a11eee5b5a255099fa29bb3e4 (diff)
Docs - point to property types from tutorial and QML Basic Types page
Diffstat (limited to 'doc/src/declarative/tutorial.qdoc')
-rw-r--r--doc/src/declarative/tutorial.qdoc14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc
index 4cfb9998fd..75c0f851ab 100644
--- a/doc/src/declarative/tutorial.qdoc
+++ b/doc/src/declarative/tutorial.qdoc
@@ -57,10 +57,10 @@ The tutorial's source code is located in the $QTDIR/examples/declarative/tutoria
Tutorial chapters:
-\list
-\o \l {QML Tutorial 1 - Basic Types}
-\o \l {QML Tutorial 2 - QML Component}
-\o \l {QML Tutorial 3 - States and Transitions}
+\list 1
+\o \l {QML Tutorial 1 - Basic Types}{Basic Types}
+\o \l {QML Tutorial 2 - QML Components}{QML Components}
+\o \l {QML Tutorial 3 - States and Transitions}{States and Transitions}
\endlist
*/
@@ -125,7 +125,7 @@ bin/qml $QTDIR/examples/declarative/tutorials/helloworld/tutorial1.qml
/*!
\page qml-tutorial2.html
-\title QML Tutorial 2 - QML Component
+\title QML Tutorial 2 - QML Components
\contentspage QML Tutorial
\previouspage QML Tutorial 1 - Basic Types
\nextpage QML Tutorial 3 - States and Transitions
@@ -137,7 +137,7 @@ This chapter adds a color picker to change the color of the text.
Our color picker is made of six cells with different colors.
To avoid writing the same code multiple times for each cell, we create a new \c Cell component.
A component provides a way of defining a new type that we can re-use in other QML files.
-A QML component is like a black-box and interacts with the outside world through properties, signals and slots and is generally
+A QML component is like a black-box and interacts with the outside world through properties, signals and functions and is generally
defined in its own QML file. (For more details, see \l {Defining new Components}).
The component's filename must always start with a capital letter.
@@ -158,7 +158,7 @@ An \l Item is the most basic visual element in QML and is often used as a contai
We declare a \c cellColor property. This property is accessible from \e outside our component, this allows us
to instantiate the cells with different colors.
-This property is just an alias to an existing property - the color of the rectangle that compose the cell (see \l{intro-properties}{Properties}).
+This property is just an alias to an existing property - the color of the rectangle that compose the cell (see \l{Adding new properties}).
\snippet examples/declarative/tutorials/helloworld/Cell.qml 5