diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.qml | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.qml new file mode 100644 index 0000000000..427827ca89 --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.2.qml @@ -0,0 +1,2 @@ +foo { +} |