Tweak scope ordering (again)

ids and methods shadow properties.  The reasoning is that the user
explicitly declared these names, whereas they might not even know a
property by that name exists.

2 files changed, 70 insertions, 13 deletions

diff --git a/tests/auto/declarative/qmlecmascript/data/scope.2.qml b/tests/auto/declarative/qmlecmascript/data/scope.2.qml
new file mode 100644
index 0000000..433a22e
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/scope.2.qml
@@ -0,0 +1,42 @@
+import Qt 4.6
+
+Item {
+    property int a: 0
+    property int b: 0
+
+    Script {
+        function b() { return 11; }
+        function c() { return 33; }
+    }
+
+    Object {
+        id: a
+        property int value: 19
+    }
+
+    Object {
+        id: c
+        property int value: 24
+    }
+
+    Object {
+        id: nested
+        property int a: 1
+        property int test: a.value
+        property int test2: b()
+        property int test3: c.value
+    }
+
+
+    // id takes precedence over local, and root properties
+    property int test1: a.value 
+    property alias test2: nested.test
+
+    // methods takes precedence over local, and root properties
+    property int test3: b()
+    property alias test4: nested.test2
+
+    // id takes precedence over methods
+    property int test5: c.value
+    property alias test6: nested.test3
+}
diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
index 673be35..5e04f7c 100644
--- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
+++ b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
@@ -538,20 +538,35 @@ void tst_qmlecmascript::nonExistantAttachedObject()
 
 void tst_qmlecmascript::scope()
 {
-    QmlComponent component(&engine, TEST_FILE("scope.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
+    {
+        QmlComponent component(&engine, TEST_FILE("scope.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("test1").toInt(), 1);
+        QCOMPARE(object->property("test2").toInt(), 2);
+        QCOMPARE(object->property("test3").toString(), QString("1Test"));
+        QCOMPARE(object->property("test4").toString(), QString("2Test"));
+        QCOMPARE(object->property("test5").toInt(), 1);
+        QCOMPARE(object->property("test6").toInt(), 1);
+        QCOMPARE(object->property("test7").toInt(), 2);
+        QCOMPARE(object->property("test8").toInt(), 2);
+        QCOMPARE(object->property("test9").toInt(), 1);
+        QCOMPARE(object->property("test10").toInt(), 3);
+    }
+
+    {
+        QmlComponent component(&engine, TEST_FILE("scope.2.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
 
-    QCOMPARE(object->property("test1").toInt(), 1);
-    QCOMPARE(object->property("test2").toInt(), 2);
-    QCOMPARE(object->property("test3").toString(), QString("1Test"));
-    QCOMPARE(object->property("test4").toString(), QString("2Test"));
-    QCOMPARE(object->property("test5").toInt(), 1);
-    QCOMPARE(object->property("test6").toInt(), 1);
-    QCOMPARE(object->property("test7").toInt(), 2);
-    QCOMPARE(object->property("test8").toInt(), 2);
-    QCOMPARE(object->property("test9").toInt(), 1);
-    QCOMPARE(object->property("test10").toInt(), 3);
+        QCOMPARE(object->property("test1").toInt(), 19);
+        QCOMPARE(object->property("test2").toInt(), 19);
+        QCOMPARE(object->property("test3").toInt(), 11);
+        QCOMPARE(object->property("test4").toInt(), 11);
+        QCOMPARE(object->property("test5").toInt(), 24);
+        QCOMPARE(object->property("test6").toInt(), 24);
+    }
 }
 
 /*