summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/qmlintro.qdoc
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2009-11-24 02:56:46 (GMT)
committerBea Lam <bea.lam@nokia.com>2009-11-24 02:56:46 (GMT)
commite111b77a1c1a02c3508db4981ae7daf4730f23dd (patch)
treebaa1a53c7745238d4682ee39cd03d0c21f3970c4 /doc/src/declarative/qmlintro.qdoc
parent8bbbb67aa06077678a0bd865783efc1212a918c3 (diff)
downloadQt-e111b77a1c1a02c3508db4981ae7daf4730f23dd.zip
Qt-e111b77a1c1a02c3508db4981ae7daf4730f23dd.tar.gz
Qt-e111b77a1c1a02c3508db4981ae7daf4730f23dd.tar.bz2
Minor doc improvements
Diffstat (limited to 'doc/src/declarative/qmlintro.qdoc')
-rw-r--r--doc/src/declarative/qmlintro.qdoc24
1 files changed, 12 insertions, 12 deletions
diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc
index f84d614..a97d0d1 100644
--- a/doc/src/declarative/qmlintro.qdoc
+++ b/doc/src/declarative/qmlintro.qdoc
@@ -48,7 +48,7 @@
\section1 What is QML?
QML is a declarative language designed to describe the user interface of a
-program: both what it looks like and how it behaves. In QML, a user
+program: both what it looks like, and how it behaves. In QML, a user
interface is specified as a tree of objects with properties.
\section1 What should I know before starting?
@@ -56,8 +56,8 @@ interface is specified as a tree of objects with properties.
This introduction is meant for those with little or no programming
experience. JavaScript is used as a scripting language in QML, so you may want
to learn a bit more about it (\l{JavaScript: The Definitive Guide}) before diving
-too deep into QML. It's also helpful to have a basic understanding of other web
-technologies like HTML and CSS, but not required.
+deeper into QML. It's also helpful to have a basic understanding of other web
+technologies like HTML and CSS, but it's not required.
\section1 Basic QML Syntax
@@ -131,18 +131,18 @@ Item {
}
\endcode
-In the example above, the Text2 object will display the same text as Text1. If Text1 is updated,
-Text2 will be updated as well.
+In the example above, the \c text2 object will display the same text as \c text1. If \c text1 is changed,
+\c text2 is automatically changed to the same value.
-Note that to refer to other objects, we use their \e id (more information on the id property can be
-found in a following section).
+Note that to refer to other objects, we use their \e id values. (See below for more
+information on the \e id property.)
\section1 QML Comments
Commenting in QML is similar to JavaScript.
\list
-\o Single line comments begin with // and end at the end of the line.
-\o Multiline comments begin with /* and end with *\/
+\o Single line comments start with // and finish at the end of the line.
+\o Multiline comments start with /* and finish with *\/
\endlist
\quotefile doc/src/snippets/declarative/comments.qml
@@ -173,7 +173,7 @@ Properties begin with a lowercase letter (with the exception of \l{Attached Prop
\section2 Property types
-QML supports properties of many types (\l{Common QML Types}). The basic types include int,
+QML supports properties of many types (see \l{Common QML Types}). The basic types include int,
real, bool, string, color, and lists.
\code
@@ -186,12 +186,12 @@ Item {
\endcode
QML properties are what is known as \e typesafe. That is, they only allow you to assign a value that
-matches the property type. For example, the scale property of item is a real, and if you try to assign
+matches the property type. For example, the \c x property of item is a real, and if you try to assign
a string to it you will get an error.
\badcode
Item {
- scale: "hello" //illegal!
+ x: "hello" // illegal!
}
\endcode