diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-10 23:00:14 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-10 23:00:14 (GMT) |
| commit | ad925d41019d5e5c47143ab91f775f970995ad0d (patch) | |
| tree | ad05cea02ddf9c87b832fc7111bb1b09f5203408 /tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml | |
| parent | b7d91c0d798bc10dd4f8a750723285076fb96935 (diff) | |
| parent | 38e1ed3b51d6aad46912eb548490d038e58203d9 (diff) | |
| download | Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.zip Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.tar.gz Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml index 0a933e8..090c948 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml @@ -1,13 +1,14 @@ import Qt.test 1.0 MyQmlObject { + id: obj property alias c1: myConstants.c1 property alias c2: myConstants.c2 property int c3: 0 objectProperty: ConstantsOverrideBindings { id: myConstants - c2: c3 + c2: obj.c3 } } |