diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 05:18:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 05:18:35 (GMT) |
| commit | 1ebf63580152cba99c54e0241633145b6d7927e3 (patch) | |
| tree | de411ad41aaf130db437d2082d58083bdfc7aa7d /tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml | |
| parent | 4c9e2a4376a52891a21f75e2a441848234ed93c2 (diff) | |
| parent | 63e6b999144dfbd4ab230973d7e682361e8fe182 (diff) | |
| download | Qt-1ebf63580152cba99c54e0241633145b6d7927e3.zip Qt-1ebf63580152cba99c54e0241633145b6d7927e3.tar.gz Qt-1ebf63580152cba99c54e0241633145b6d7927e3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
emit currentSectionChanged when section changes in ListView.
Remove some unnecessary includes in cpp files
Ensure Flickable.contentX and Flickable.contentY return correct values.
Don't allow multiple values to be assigned to a singular property
Fix dragging items within a PathView
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml index cc71753..a363373 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.3.qml @@ -2,5 +2,5 @@ import Test 1.0 MyTypeObject { id: root - property alias a: root.rectProperty.x + property alias a: root.rectProperty.x.y } |