diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-11-19 05:06:49 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-11-19 05:06:49 (GMT) |
| commit | f9ee74e207f8604d0d94c5e83e50ae12492930c1 (patch) | |
| tree | 11edcfd3ca1c84feb264039b526c0d3a520568c4 /tests/auto/declarative/qmlinfo/data | |
| parent | a7493235a70f9e60d5d25d84b0782ee0a2e5c5fd (diff) | |
| parent | 3e78ae2e6ec8df4b69845c936f6d4f6d43c15acc (diff) | |
| download | Qt-f9ee74e207f8604d0d94c5e83e50ae12492930c1.zip Qt-f9ee74e207f8604d0d94c5e83e50ae12492930c1.tar.gz Qt-f9ee74e207f8604d0d94c5e83e50ae12492930c1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative/qmlinfo/data')
| -rw-r--r-- | tests/auto/declarative/qmlinfo/data/NestedObject.qml | 4 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlinfo/data/qmlObject.qml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/declarative/qmlinfo/data/NestedObject.qml b/tests/auto/declarative/qmlinfo/data/NestedObject.qml index ac96d20..cd5b426 100644 --- a/tests/auto/declarative/qmlinfo/data/NestedObject.qml +++ b/tests/auto/declarative/qmlinfo/data/NestedObject.qml @@ -1,8 +1,8 @@ import Qt 4.6 -Object { +QtObject { property var nested - nested: Object {} + nested: QtObject {} } diff --git a/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml b/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml index ee98354..a2ce78a 100644 --- a/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml +++ b/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Object { +QtObject { property var nested nested: NestedObject { } property var nested2: nested.nested diff --git a/tests/auto/declarative/qmlinfo/data/qmlObject.qml b/tests/auto/declarative/qmlinfo/data/qmlObject.qml index b86063b..ce05f89 100644 --- a/tests/auto/declarative/qmlinfo/data/qmlObject.qml +++ b/tests/auto/declarative/qmlinfo/data/qmlObject.qml @@ -1,8 +1,8 @@ import Qt 4.6 -Object { +QtObject { property var nested - nested: Object { + nested: QtObject { } } |