diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-08-06 13:09:02 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-08-06 13:09:02 (GMT) |
| commit | 8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143 (patch) | |
| tree | 4f19a338ad94e70992a95166544afacac45ef2e1 /tests/auto/declarative/qdeclarativefocusscope/data/test5.qml | |
| parent | d8ecf6b6f6b6c0f532a4c9f25bcd36e808dc0d2a (diff) | |
| parent | b738719a192c49f9bab64cebfa2bad67b9630870 (diff) | |
| download | Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.zip Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.tar.gz Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Conflicts:
src/dbus/qdbusmacros.h
Diffstat (limited to 'tests/auto/declarative/qdeclarativefocusscope/data/test5.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativefocusscope/data/test5.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml b/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml index cdb5164..4417d5f 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml +++ b/tests/auto/declarative/qdeclarativefocusscope/data/test5.qml @@ -20,13 +20,13 @@ Rectangle { color: "transparent" border.width: 5 - border.color: myScope.wantsFocus?"blue":"black" + border.color: myScope.activeFocus?"blue":"black" Rectangle { x: 10; y: 10 width: 100; height: 100; color: "green" border.width: 5 - border.color: item1.wantsFocus?"blue":"black" + border.color: item1.activeFocus?"blue":"black" } TextEdit { @@ -47,13 +47,13 @@ Rectangle { x: 310; y: 10 width: 100; height: 100; color: "green" border.width: 5 - border.color: wantsFocus?"blue":"black" + border.color: activeFocus?"blue":"black" KeyNavigation.left: item1 Keys.onReturnPressed: console.log("Top Right"); Rectangle { width: 50; height: 50; anchors.centerIn: parent - color: parent.focus?"red":"transparent" + color: parent.activeFocus?"red":"transparent" } } } @@ -66,7 +66,7 @@ Rectangle { x: 10; y: 300 width: 100; height: 100; color: "green" border.width: 5 - border.color: item3.wantsFocus?"blue":"black" + border.color: item3.activeFocus?"blue":"black" } TextEdit { |