diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:21:42 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:29:17 +0200 |
| commit | bbb78a92a910d32b2886af62c218db87325eb6ce (patch) | |
| tree | 0e4b55352bb9f083826d0e80747982823f2894ed /src/qml/qml/qqmltypeloader.cpp | |
| parent | 4b5a7b15fc6d3650c8e9b7bf619804a0a953eeba (diff) | |
| parent | 8ed38c70fd29680f7981d9d23581d46cf32139d0 (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into HEAD
Conflicts:
src/qml/compiler/qv4isel_masm.cpp
src/qml/jsruntime/qv4script.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmltypeloader_p.h
Change-Id: Ia784d855a2131e3289454f12d841ca2c65be15c1
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index e1f96442b1..810347fd03 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qqmltypeloader_p.h" -#include "qqmlabstracturlinterceptor_p.h" +#include "qqmlabstracturlinterceptor.h" #include <private/qqmlengine_p.h> #include <private/qqmlglobal_p.h> @@ -1252,7 +1252,13 @@ bool QQmlTypeLoader::Blob::addImport(const QQmlScript::Import &import, QList<QQm QString qmldirFilePath; QString qmldirUrl; - if (m_imports.locateQmldir(importDatabase, import.uri, import.majorVersion, import.minorVersion, + if (QQmlMetaType::isLockedModule(import.uri, import.majorVersion)) { + //Locked modules are checked first, to save on filesystem checks + if (!m_imports.addLibraryImport(importDatabase, import.uri, import.qualifier, import.majorVersion, + import.minorVersion, QString(), QString(), false, errors)) + return false; + + } else if (m_imports.locateQmldir(importDatabase, import.uri, import.majorVersion, import.minorVersion, &qmldirFilePath, &qmldirUrl)) { // This is a local library import if (!m_imports.addLibraryImport(importDatabase, import.uri, import.qualifier, import.majorVersion, |