summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-07-26 23:59:59 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-07-27 02:12:49 (GMT)
commit9ea7bb34e4b41e1263acb8a175f61566046f9bf6 (patch)
treecf1c34db5cb295f05fde2fc562f1b867032fd9bf /src/declarative/util
parentb4b0bdda668e9845623995c788d88a774dd52d98 (diff)
downloadQt-9ea7bb34e4b41e1263acb8a175f61566046f9bf6.zip
Qt-9ea7bb34e4b41e1263acb8a175f61566046f9bf6.tar.gz
Qt-9ea7bb34e4b41e1263acb8a175f61566046f9bf6.tar.bz2
various doc fixes
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativetimer.cpp11
-rw-r--r--src/declarative/util/qdeclarativetransition.cpp4
2 files changed, 7 insertions, 8 deletions
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp
index 576995f..838a8f3 100644
--- a/src/declarative/util/qdeclarativetimer.cpp
+++ b/src/declarative/util/qdeclarativetimer.cpp
@@ -73,11 +73,12 @@ public:
\since 4.7
\brief The Timer item triggers a handler at a specified interval.
- A timer can be used to trigger an action either once, or repeatedly
+ A Timer can be used to trigger an action either once, or repeatedly
at a given interval.
- Here is a timer that shows the current date and time, and updates
- the text every 500 milliseconds:
+ Here is a Timer that shows the current date and time, and updates
+ the text every 500 milliseconds. It uses the JavaScript \c Date
+ object to access the current time.
\qml
import Qt 4.7
@@ -88,9 +89,7 @@ public:
onTriggered: time.text = Date().toString()
}
- Text {
- id: time
- }
+ Text { id: time }
}
\endqml
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index 6561b8c..582191b 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -66,13 +66,13 @@ QT_BEGIN_NAMESPACE
\snippet doc/src/snippets/declarative/transition.qml 0
- To specify multiple transitions, specify \l Item::transitions as a list:
+ To define multiple transitions, specify \l Item::transitions as a list:
\qml
Item {
...
transitions: [
- Transition { ... }
+ Transition { ... },
Transition { ... }
]
}