diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:54:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:54:16 (GMT) |
| commit | cb50699b39e016a64a2a06088042622546c428a2 (patch) | |
| tree | 77d269a3103a6c140098b9caaafd17a29a81addd /tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml | |
| parent | 89807f70656b95c1568ef183dd7f28c527fc3eaa (diff) | |
| parent | 890c1110ec5e39bb6e63e99fe09c296c1ea824be (diff) | |
| download | Qt-cb50699b39e016a64a2a06088042622546c428a2.zip Qt-cb50699b39e016a64a2a06088042622546c428a2.tar.gz Qt-cb50699b39e016a64a2a06088042622546c428a2.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
demos/declarative/snake/snake.qml
qmake/generators/symbian/symbiancommon.cpp
src/network/access/qnetworkaccessmanager.cpp
src/s60installs/s60installs.pro
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml index 95f34d8..9555b7f 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml @@ -2,7 +2,7 @@ import QtQuick 1.0 Item { property int a: 0 - property int b: 0 + property int b: 14 function b() { return 11; } function c() { return 33; } @@ -21,7 +21,7 @@ Item { id: nested property int a: 1 property int test: a.value - property int test2: b() + property int test2: b property int test3: c.value } @@ -30,8 +30,8 @@ Item { property int test1: a.value property alias test2: nested.test - // methods takes precedence over local, and root properties - property int test3: b() + // properties takes precedence over local, and root methods + property int test3: b property alias test4: nested.test2 // id takes precedence over methods |