summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-02-17 20:38:27 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-02-17 20:38:27 (GMT)
commite1b85d70420001f2be698d08e62b7e784a13a134 (patch)
treeca21ef6afc045e409d1c33043e4a78415df8e820 /doc/src
parentc164a5be25cb8bd70235571169b66af2fc6a8cbd (diff)
downloadQt-e1b85d70420001f2be698d08e62b7e784a13a134.zip
Qt-e1b85d70420001f2be698d08e62b7e784a13a134.tar.gz
Qt-e1b85d70420001f2be698d08e62b7e784a13a134.tar.bz2
Doc: Fixed links and whitespace.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc4
-rw-r--r--doc/src/snippets/declarative/animation.qml5
-rw-r--r--doc/src/snippets/declarative/events.qml14
-rw-r--r--doc/src/snippets/declarative/mousearea/mousearea-snippet.qml10
4 files changed, 16 insertions, 17 deletions
diff --git a/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc b/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc
index e33ee13..ac3669d 100644
--- a/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc
+++ b/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc
@@ -90,8 +90,8 @@ Similar to JavaScript or C++, there are two ways of commenting QML code:
\section1 Group Properties
-Many QML properties are \l{attached-properties}{attached} or
-\l {qml-grouped-properties}{group} properties. For convenience, you may treat
+Many QML properties are \l{attached-properties}{attached} or
+\l {qml-grouped-properties}{group} properties. For convenience, you may treat
them as another element when dealing with multiple properties belonging to the
same group.
diff --git a/doc/src/snippets/declarative/animation.qml b/doc/src/snippets/declarative/animation.qml
index 739d009..ae6142d 100644
--- a/doc/src/snippets/declarative/animation.qml
+++ b/doc/src/snippets/declarative/animation.qml
@@ -179,7 +179,7 @@ Rectangle {
}
//! [behavior animation]
-//! [sequential animation]
+//! [sequential animation]
Rectangle {
id: banner
width: 150; height: 100; border.color: "black"
@@ -216,7 +216,7 @@ Rectangle {
NumberAnimation { target: deploy; property: "opacity"; to: 1.0; duration: 200}
}
}
-//! [sequential animation]
+//! [sequential animation]
}//end of col
//! [parent end]
@@ -224,4 +224,3 @@ Rectangle {
//! [parent end]
//! [document]
-
diff --git a/doc/src/snippets/declarative/events.qml b/doc/src/snippets/declarative/events.qml
index 52fc2bc..3dc44f2 100644
--- a/doc/src/snippets/declarative/events.qml
+++ b/doc/src/snippets/declarative/events.qml
@@ -63,7 +63,7 @@ onSend: {
onPerform: console.log("perform signal emitted")
//! [signal handler declaration]
-//! [automatic signals]
+//! [automatic signals]
Rectangle {
id: sprite
width: 25; height: 25
@@ -72,7 +72,7 @@ Rectangle {
onXChanged: console.log("x property changed, emitted xChanged signal")
onYChanged: console.log("y property changed, emitted yChanged signal")
}
-//! [automatic signals]
+//! [automatic signals]
//! [signal emit]
Rectangle {
@@ -88,7 +88,7 @@ Rectangle {
}
//! [signal emit]
-//! [connect method]
+//! [connect method]
Rectangle {
id: relay
@@ -112,9 +112,9 @@ Rectangle {
console.log("Sending to email: " + person + ", " + notice)
}
}
-//! [connect method]
+//! [connect method]
-//! [forward signal]
+//! [forward signal]
Rectangle {
id: forwarder
width: 100; height: 100
@@ -131,9 +131,9 @@ Rectangle {
mousearea.clicked.connect(send)
}
}
-//! [forward signal]
+//! [forward signal]
-//! [connect method]
+//! [connect method]
//![parent end]
}
//![parent end]
diff --git a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
index 99cdc8b..03473ba 100644
--- a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
+++ b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
@@ -47,7 +47,7 @@ Rectangle {
width: 500; height: 500
color: "green"
-Column {
+Column {
//! [anchor fill]
Rectangle {
id: button
@@ -68,21 +68,21 @@ Rectangle {
id: button
width: 100; height: 100
-//! [enable handlers]
+//! [enable handlers]
MouseArea {
hoverEnabled: true
acceptedButtons: Qt.LeftButton | Qt.RightButton
onEntered: console.log("mouse entered the area")
onExited: console.log("mouse left the area")
}
-//! [enable handlers]
+//! [enable handlers]
}
Rectangle {
id: button
width: 100; height: 100
-//! [mouse handlers]
+//! [mouse handlers]
MouseArea {
anchors.fill: parent
onClicked: console.log("area clicked")
@@ -90,7 +90,7 @@ Rectangle {
onEntered: console.log("mouse entered the area")
onExited: console.log("mouse left the area")
}
-//! [mouse handlers]
+//! [mouse handlers]
}
} //end of column