diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 15:50:28 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 15:50:28 +0200 |
| commit | 715d0b474b23bc230319c33eb7316af23b5fccaa (patch) | |
| tree | ffd714454ce559433551632ffaaee1a21d8fd0a3 /tests/manual | |
| parent | 607f2db351edf4b0f677c302fa37733596abe024 (diff) | |
| parent | 52eb21be3dd3a76d018b5b86a8d72d68accb924a (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
tests/auto/qml/qml.pro
Change-Id: Ib373aed6a8f8df9521740fb5b080daed38546cd2
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/qmltypememory/main.qml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/manual/qmltypememory/main.qml b/tests/manual/qmltypememory/main.qml index 7bc9006aec..fa78381601 100644 --- a/tests/manual/qmltypememory/main.qml +++ b/tests/manual/qmltypememory/main.qml @@ -51,4 +51,5 @@ QtObject { property TestType tt //No object, although it should be properly parented if there were one property TestTypeCpp tt2 //No object, although it should be properly parented if there were one property TestTypePlugin tt3 + property Item it } |