diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-07 05:15:32 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-07 05:15:32 (GMT) |
| commit | eb1890d43f2abbac594f17eea047e88c3c0b529e (patch) | |
| tree | c681543556e4d2ecf334bb6321877f77db95fbe4 /src/declarative | |
| parent | 78b2fedbf828420938980362eab0914365525796 (diff) | |
| parent | d6f7bfaac0807ac534d7313003b8e399b3f04fdc (diff) | |
| download | Qt-eb1890d43f2abbac594f17eea047e88c3c0b529e.zip Qt-eb1890d43f2abbac594f17eea047e88c3c0b529e.tar.gz Qt-eb1890d43f2abbac594f17eea047e88c3c0b529e.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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"))); |