diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-21 13:12:18 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-21 13:12:18 +0200 |
| commit | 1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd (patch) | |
| tree | 066bdf995360981ebb645383b93866133c1ca000 /tools/qml | |
| parent | a334ad303d2763cd53fc5bd62945d08d3555b8a7 (diff) | |
| parent | 43bce78bd5a41115ab5a541243cc3edcecd2904e (diff) | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/plugins/qmltooling/qmldbg_ost/qostdevice.h
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/startup/startup.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qml/startup/startup.qml b/tools/qml/startup/startup.qml index fae74010c1..a216ac6fe9 100644 --- a/tools/qml/startup/startup.qml +++ b/tools/qml/startup/startup.qml @@ -90,7 +90,7 @@ Rectangle { NumberAnimation on rotation { from: 0 to: 360 - loops: NumberAnimation.Infinite + loops: 3 running: true duration: 2000 } |