summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-11-06 03:46:57 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-11-06 03:46:57 (GMT)
commitcd9f07d8c488ff35cceb73924af4da4bdc10a647 (patch)
tree8ce137546582b1eaa500322917b65d7d75d25516 /src/declarative/util
parent9c984b6b421e7cc6c091623f63ed84ce700f1ee1 (diff)
parent61d479a412e43255bf0681bec1cfb599cb7be886 (diff)
downloadQt-cd9f07d8c488ff35cceb73924af4da4bdc10a647.zip
Qt-cd9f07d8c488ff35cceb73924af4da4bdc10a647.tar.gz
Qt-cd9f07d8c488ff35cceb73924af4da4bdc10a647.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmltimer.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp
index 0aa0747..8ee9059 100644
--- a/src/declarative/util/qmltimer.cpp
+++ b/src/declarative/util/qmltimer.cpp
@@ -176,6 +176,11 @@ void QmlTimer::setRepeating(bool repeating)
/*!
\qmlproperty bool Timer::triggeredOnStart
+ When the Timer is started the first trigger is normally after the specified
+ interval has elapsed. It is sometimes desireable to trigger immediately
+ when the timer is started, for example to establish an initial
+ state.
+
If \a triggeredOnStart is true, the timer will be triggered immediately
when started, and subsequently at the specified interval. Note that for
a Timer with \e repeat set to false, this will result in the timer being