diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-13 00:12:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-13 00:12:35 (GMT) |
| commit | 91054842ae3b87b224ea153711cedf7056e4da60 (patch) | |
| tree | 1de54549136dd2047a9678d77368d4b30e783788 /tests/auto/declarative/qdeclarativefocusscope/data/test5.qml | |
| parent | 8979501336a441e585d38b711ee0fe4a284040f3 (diff) | |
| parent | 5efd577b1aea64f422e08ca8d54e041fa4b20783 (diff) | |
| download | Qt-91054842ae3b87b224ea153711cedf7056e4da60.zip Qt-91054842ae3b87b224ea153711cedf7056e4da60.tar.gz Qt-91054842ae3b87b224ea153711cedf7056e4da60.tar.bz2 | |
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:
Autotest for QTBUG-5491 (Animation in a Behavior doesn't update running)
Private variable cleanup.
wantsFocus should be based on FocusScope chain, not parent chain.
Diffstat (limited to 'tests/auto/declarative/qdeclarativefocusscope/data/test5.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativefocusscope/data/test5.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml b/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml index d67ec57..cdb5164 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml +++ b/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml @@ -9,12 +9,12 @@ Rectangle { FocusScope { id: myScope + objectName: "item0" focus: true Keys.onReturnPressed: console.log("Error - FocusScope") Rectangle { - objectName: "item0" height: 120 width: 420 |