Android: Support implicit import paths for assets:/ urls
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Thu, 4 Apr 2013 14:17:35 +0000 (16:17 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 5 Apr 2013 10:28:25 +0000 (12:28 +0200)
commit6eed3409c4ecf69d3c43cdcbeeca829624b9fe25
treee342ac85f4bd6267a1618f2f6fff44fe381ee03c
parente5d9cb4f3534e2d2fe6d28867b71c87ccb1438db
Android: Support implicit import paths for assets:/ urls

The assets: scheme is not handled by QNetworkAccessManager, so it needs
to be special cased along side the qrc: scheme. We make QML recognize
it as a synchronously loaded, local file, and we make the type loader
get the correct path and check existence of the directory correctly.
This makes it possible to implicitly import the containing directory
of QML files that are bundled in the assets directory.

Task-number: QTBUG-30510

Change-Id: I048292757e509066a4af342081ec8428e2bd8af3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
src/qml/qml/qqmlfile.cpp
src/qml/qml/qqmltypeloader.cpp