diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-11-26 04:10:13 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-11-26 04:10:13 (GMT) |
| commit | 33a6e1e08b0a542fc631f28ddc269cec2fec97ce (patch) | |
| tree | 9049506f565c296d26fcc8baa88d13351eb29e83 /src | |
| parent | dbc13c80c8d06af0aa2187946d3fb2bab1654f2e (diff) | |
| parent | 0204bc0a7031d017f8999bc73005fab46cc59d5e (diff) | |
| download | Qt-33a6e1e08b0a542fc631f28ddc269cec2fec97ce.zip Qt-33a6e1e08b0a542fc631f28ddc269cec2fec97ce.tar.gz Qt-33a6e1e08b0a542fc631f28ddc269cec2fec97ce.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qmltimer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp index da60193..9b54337 100644 --- a/src/declarative/util/qmltimer.cpp +++ b/src/declarative/util/qmltimer.cpp @@ -303,7 +303,9 @@ void QmlTimer::finished() if (d->repeating || !d->running) return; emit triggered(); + d->running = false; d->firstTick = false; + emit runningChanged(); } QT_END_NAMESPACE |