QML focus API updates.

The wantsFocus property has been renamed to activeFocus, to better
reflect its value. Reading and writing the focus property is also now
consistent -- this property represents focus within a scope. Other small
changes were made to keep things consistent with the new naming.

Reviewed-by: Aaron Kennedy

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/test2.qml b/tests/auto/declarative/qdeclarativefocusscope/data/test2.qml
index 216277e..5ed701d 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/data/test2.qml
+++ b/tests/auto/declarative/qdeclarativefocusscope/data/test2.qml
@@ -10,27 +10,27 @@ Rectangle {
     FocusScope {
         y: 100
         focus: true; objectName: "item1"
-        Rectangle { width: 50; height: 50; color: parent.wantsFocus?"red":"blue" }
+        Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
 
         FocusScope {
             y: 100
             focus: true; objectName: "item2"
-            Rectangle { width: 50; height: 50; color: parent.wantsFocus?"red":"blue" }
+            Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
 
             FocusScope {
                 y: 100
                 focus: true; objectName: "item3"
-                Rectangle { width: 50; height: 50; color: parent.wantsFocus?"red":"blue" }
+                Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
 
                 FocusScope {
                     y: 100
                     focus: true; objectName: "item4"
-                    Rectangle { width: 50; height: 50; color: parent.wantsFocus?"red":"blue" }
+                    Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
 
                     FocusScope {
                         y: 100
                         focus: true; objectName: "item5"
-                        Rectangle { width: 50; height: 50; color: parent.wantsFocus?"red":"blue" }
+                        Rectangle { width: 50; height: 50; color: parent.activeFocus?"red":"blue" }
                     }
                 }
             }