From 38db6eba54534207126915f6f195c8af9f772833 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Wed, 24 Mar 2010 13:59:02 +0100 Subject: Help qt-qml integrate. Git seems to be having trouble with the merge, this might make it easier. --- tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml | 2 ++ .../declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml delete mode 100644 tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml diff --git a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml new file mode 100644 index 0000000..2d1a4a3 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml @@ -0,0 +1,2 @@ +import Qt 4.6 + diff --git a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml deleted file mode 100644 index 2d1a4a3..0000000 --- a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml +++ /dev/null @@ -1,2 +0,0 @@ -import Qt 4.6 - -- cgit v0.12