diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-07-16 15:46:21 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-07-16 15:46:21 (GMT) |
| commit | 6b1b666574d6e27efdd3b243de8815a5278c3666 (patch) | |
| tree | 7a5ac02fe569b3fc497ca8d0a333d10587eb3567 /tests/auto/declarative/qdeclarativefocusscope/data/test.qml | |
| parent | eef1d13743baddf41bd135d98fc2ad12944b8477 (diff) | |
| parent | ab4dde176cfa314522964e5e5fbf9f2d388f8fdf (diff) | |
| download | Qt-6b1b666574d6e27efdd3b243de8815a5278c3666.zip Qt-6b1b666574d6e27efdd3b243de8815a5278c3666.tar.gz Qt-6b1b666574d6e27efdd3b243de8815a5278c3666.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tests/auto/declarative/qdeclarativefocusscope/data/test.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativefocusscope/data/test.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/test.qml b/tests/auto/declarative/qdeclarativefocusscope/data/test.qml index 6b09c29..aa43ba8 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/data/test.qml +++ b/tests/auto/declarative/qdeclarativefocusscope/data/test.qml @@ -9,12 +9,12 @@ Rectangle { FocusScope { id: myScope + objectName: "item0" focus: true Keys.onDigit9Pressed: console.log("Error - FocusScope") Rectangle { - objectName: "item0" height: 120 width: 420 |