summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-04-01 12:58:26 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2011-04-01 14:02:17 (GMT)
commit151e48fef2a74a7d153a5a8eaff1088a4b1a9043 (patch)
tree4c23dcbe59d80d726761f1080646588855b41a61 /tests/auto/declarative
parenta3b79f7449fc960da1b3ae39e0127c875c43b90f (diff)
downloadQt-151e48fef2a74a7d153a5a8eaff1088a4b1a9043.zip
Qt-151e48fef2a74a7d153a5a8eaff1088a4b1a9043.tar.gz
Qt-151e48fef2a74a7d153a5a8eaff1088a4b1a9043.tar.bz2
QNetworkDiskCache: clean up after merge request
changes include whitespace, parenting, recovering erroneously deleted code etc. Reviewed-by: Markus Goetz
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
index e69de29..98d6b74 100644
--- a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
+++ b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
@@ -0,0 +1,2 @@
+Foo 1.1 Foo.qml
+Foo 1.0 Foo.qml