summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2010-03-17 13:21:21 (GMT)
committermae <qt-info@nokia.com>2010-03-17 13:21:53 (GMT)
commitca8231566ac3804e479502d082871ab8ca28b8bb (patch)
tree3e70fdfa3888819387ceb714a430123f8c55a901
parent8c724518e2d2f68442cedbfd09cb84c545438cba (diff)
downloadQt-ca8231566ac3804e479502d082871ab8ca28b8bb.zip
Qt-ca8231566ac3804e479502d082871ab8ca28b8bb.tar.gz
Qt-ca8231566ac3804e479502d082871ab8ca28b8bb.tar.bz2
Fix auto test
This repairs 9727cb35b30e07d1f72100a39c8d23e438e2746c. The lookup can only happen if we have a file import (and not a library import)
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index f655151..4449404 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1386,7 +1386,6 @@ struct QDeclarativeEnginePrivate::ImportedNamespace {
QString qmldircontent = qmlDirContent.at(i);
if (!qmldircontent.isEmpty()) {
-
const QString typeName = QString::fromUtf8(type);
QDeclarativeDirParser qmldirParser;
@@ -1403,15 +1402,16 @@ struct QDeclarativeEnginePrivate::ImportedNamespace {
}
}
}
-
}
- // 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;
+ if (!isLibrary.at(i)) {
+ // 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;