diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 04:06:57 (GMT) |
---|---|---|
committer | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 04:06:57 (GMT) |
commit | 423e373ed0935ebe3d2f54a4c56101081c3311b5 (patch) | |
tree | 35e27c69dee1d96775f4a921e93f5cd2e574a834 /tests/auto/declarative/qdeclarativefocusscope/data/test5.qml | |
parent | a9b6c59857c28f48e093abccaf9a89755b0995bc (diff) | |
parent | 444fa479484f80cbd5de3e9c5fa2b2e4082643dd (diff) | |
download | Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.zip Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.gz Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.bz2 |
Merge branch '4.7' of ../oslo-staging-1 into 4.7
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 |