diff options
| author | Fawzi Mohamed <[email protected]> | 2015-01-22 15:00:34 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <[email protected]> | 2015-02-16 15:10:59 +0000 |
| commit | b3f049aa7d4024f930542c08fe79790559abcb7e (patch) | |
| tree | 1d11070ac0b70f8f6f26d9a2ae129b5866568387 /src/libs/qmljs/qmljslink.cpp | |
| parent | 004735ea48dd32d593b4fbcd4d6eea17a223d8e8 (diff) | |
qmljs: load qmltypes even if there is no plugin
Change-Id: Ib193113c2c6bf085765d20e4f8d0b89b43cca0e1
Reviewed-by: Tim Jenssen <[email protected]>
Diffstat (limited to 'src/libs/qmljs/qmljslink.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index b5e4da86f3e..e885a6114e0 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -462,7 +462,7 @@ bool LinkPrivate::importLibrary(Document::Ptr doc, if (const UiImport *ast = importInfo.ast()) errorLoc = locationFromRange(ast->firstSourceLocation(), ast->lastSourceLocation()); - if (!libraryInfo.plugins().isEmpty()) { + if (!libraryInfo.plugins().isEmpty() || !libraryInfo.typeInfos().isEmpty()) { if (libraryInfo.pluginTypeInfoStatus() == LibraryInfo::NoTypeInfo) { ModelManagerInterface *modelManager = ModelManagerInterface::instance(); if (modelManager) { |