diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-09 12:15:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 12:44:43 +0100 |
| commit | 3146dcbdc768c90a03b58eed3f42630604443093 (patch) | |
| tree | 10e234460c5f57012b346cdbe6304002ad0a446d /tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml | |
| parent | a7ea2afffd61e2a89f7bb2c586b4b733c4996bb5 (diff) | |
| parent | 722725cf24e45e86a2844810b90787a29df8a4a9 (diff) | |
Merge branch 'stable' into dev
Conflicts:
sync.profile
tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml new file mode 100644 index 00000000..9985d332 --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml @@ -0,0 +1,2 @@ +import QtQuick 1.0 as Qt47 +Qt47.Rectangle {} |