diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-20 23:24:42 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-20 23:24:42 +1000 |
| commit | e1ffbc04131dc6f76fa76821c297d08162e4b1ee (patch) | |
| tree | 3759931edbad1f7dfbcdc11dc05cb0c161cf1073 /tools | |
| parent | 55b84a03e33b87e44b2e65ed1c02f93aa553c323 (diff) | |
| parent | 5184d55d434296710041812976656ed6825447ec (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
Fix Symbian/Linux compilation breakage in plugins/qmltooling
Make QMLViewer startup animation stop after a while
Fix excessive scrolling in TextInput with mid string pre-edit text.
Diffstat (limited to 'tools')
| -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 } |