summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp8
-rw-r--r--src/declarative/util/qdeclarativetimer.cpp11
-rw-r--r--src/declarative/util/qdeclarativetransition.cpp4
3 files changed, 15 insertions, 8 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 1a223d5..9806957 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1557,6 +1557,10 @@ QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeAnimationGro
sources. The \l PropertyAnimation documentation shows a variety of methods
for creating animations.
+ \note Once an animation has been grouped into a SequentialAnimation or
+ ParallelAnimation, it cannot be individually started and stopped; the
+ SequentialAnimation or ParallelAnimation must be started and stopped as a group.
+
\sa ParallelAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example}
*/
@@ -1622,6 +1626,10 @@ void QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actio
sources. The \l PropertyAnimation documentation shows a variety of methods
for creating animations.
+ \note Once an animation has been grouped into a SequentialAnimation or
+ ParallelAnimation, it cannot be individually started and stopped; the
+ SequentialAnimation or ParallelAnimation must be started and stopped as a group.
+
\sa SequentialAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example}
*/
/*!
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 { ... }
]
}