diff options
author | mae <qt-info@nokia.com> | 2010-03-17 12:49:44 (GMT) |
---|---|---|
committer | mae <qt-info@nokia.com> | 2010-03-17 12:50:47 (GMT) |
commit | 8c724518e2d2f68442cedbfd09cb84c545438cba (patch) | |
tree | 0bafe8b3cc3d9ee0bf4d1cb8e3b30f6c61dac622 /src | |
parent | 63520c42a85cc4b3d7e5da6f14b6e12774274fef (diff) | |
download | Qt-8c724518e2d2f68442cedbfd09cb84c545438cba.zip Qt-8c724518e2d2f68442cedbfd09cb84c545438cba.tar.gz Qt-8c724518e2d2f68442cedbfd09cb84c545438cba.tar.bz2 |
Fix type lookup with url
The existence of a non-empty qmldir file (e.g. for defining
a plugin) should not change the lookup rules for qml files
via url
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index f4eeff4..f655151 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1404,14 +1404,14 @@ struct QDeclarativeEnginePrivate::ImportedNamespace { } } - } else { - // XXX search non-files too! (eg. zip files, see QT-524) - QFileInfo f(toLocalFileOrQrc(url)); - if (f.exists()) { - if (url_return) - *url_return = url; - return true; - } + } + + // XXX search non-files too! (eg. zip files, see QT-524) + QFileInfo f(toLocalFileOrQrc(url)); + if (f.exists()) { + if (url_return) + *url_return = url; + return true; } } return false; |