diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-03-10 06:05:22 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-03-10 06:05:22 (GMT) |
commit | b0fb09d29675f701f02fe5bf91fe64ffd0008cf6 (patch) | |
tree | f7629c08008cc879ee9153c64c6daa097d3b6432 /tests/auto/declarative | |
parent | 5f10fa564830cbfb79061c6108098c7e133b79aa (diff) | |
parent | 6db08d1cfeb70bff5a114579fb2bfbde81310b64 (diff) | |
download | Qt-b0fb09d29675f701f02fe5bf91fe64ffd0008cf6.zip Qt-b0fb09d29675f701f02fe5bf91fe64ffd0008cf6.tar.gz Qt-b0fb09d29675f701f02fe5bf91fe64ffd0008cf6.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir | 6 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir index b32f82b..303c5c8 100644 --- a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir +++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir @@ -1,3 +1,3 @@ -Test 0.0 Test.qml -TestSubDir 0.0 TestSubDir.qml -TestLocal 0.0 TestLocal.qml +Test Test.qml +TestSubDir TestSubDir.qml +TestLocal TestLocal.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir index f7016c7..a54f7df 100644 --- a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir +++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir @@ -1 +1 @@ -SubTest 0.0 SubTest.qml +SubTest SubTest.qml |