diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-09-22 04:30:54 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-09-22 04:30:54 (GMT) |
| commit | 69ba43af52a42244805f866e5c2e0bb91dc6dec5 (patch) | |
| tree | 1d5faa8efa984dcecb910a0e480a5f4cad42c58b /src/declarative/qml | |
| parent | 835a83221232d1963d4ab0b9e553cc32cb9bc8c9 (diff) | |
| parent | 0598be4043f0f483f9d32040df57ffede322c038 (diff) | |
| download | Qt-69ba43af52a42244805f866e5c2e0bb91dc6dec5.zip Qt-69ba43af52a42244805f866e5c2e0bb91dc6dec5.tar.gz Qt-69ba43af52a42244805f866e5c2e0bb91dc6dec5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index c6edbe2..dd6b5a4 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -1519,8 +1519,9 @@ public: bool found = false; foreach (QString p, importPath) { QString dir = p+QLatin1Char('/')+url; - if (QFile::exists(dir+QLatin1String("/qmldir"))) { - url = QLatin1String("file://")+dir; + QFileInfo fi(dir+QLatin1String("/qmldir")); + if (fi.isFile()) { + url = QUrl::fromLocalFile(fi.absolutePath()).toString(); found = true; break; } |