diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-07 05:09:01 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-07 05:09:01 (GMT) |
| commit | be67e10cde56ba905a8bb85bdb5ecab2b3038ede (patch) | |
| tree | 81830b2a769db0ec4e16aa838a354d522e2d7718 /src/declarative | |
| parent | 39629bcfbf1b732f717b4c9715f9edd49e45f0ea (diff) | |
| download | Qt-be67e10cde56ba905a8bb85bdb5ecab2b3038ede.zip Qt-be67e10cde56ba905a8bb85bdb5ecab2b3038ede.tar.gz Qt-be67e10cde56ba905a8bb85bdb5ecab2b3038ede.tar.bz2 | |
Resolve qualified type even if not localfile.
If remote content is fully-qualified to a unique URL, we do not need
any qmldir (and for remote content, we don't support that yet).
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 6d3506c..e3d4840 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -1509,6 +1509,10 @@ public: if (s) { if (s->find(unqualifiedtype,vmajor,vminor,type_return,url_return)) return true; + if (s->urls.count() == 1 && !s->isBuiltin[0] && !s->isLibrary[0] && url_return) { + *url_return = QUrl(s->urls[0]+"/").resolved(QUrl(QLatin1String(unqualifiedtype + ".qml"))); + return true; + } } if (url_return) { *url_return = base.resolved(QUrl(QLatin1String(type + ".qml"))); |