diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/qmljs/qmljs-lib.pri | 2 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsbind.cpp | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/libs/qmljs/qmljs-lib.pri b/src/libs/qmljs/qmljs-lib.pri index beb80b8fb8..6324d83e32 100644 --- a/src/libs/qmljs/qmljs-lib.pri +++ b/src/libs/qmljs/qmljs-lib.pri @@ -94,3 +94,5 @@ contains(QT, gui) { $$PWD/qmljscodeformatter.h \ $$PWD/qmljsreformatter.h } + +QT += xml diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp index 65804d72a0..28c5a76c26 100644 --- a/src/libs/qmljs/qmljsbind.cpp +++ b/src/libs/qmljs/qmljsbind.cpp @@ -206,15 +206,17 @@ bool Bind::visit(UiImport *ast) importId, ast); if (_doc->language() == Language::Qml) { const QString importStr = import.name() + importId; - QmlLanguageBundles langBundles = ModelManagerInterface::instance()->extendedBundles(); - QmlBundle qq1 = langBundles.bundleForLanguage(Language::QmlQtQuick1); - QmlBundle qq2 = langBundles.bundleForLanguage(Language::QmlQtQuick2); - bool isQQ1 = qq1.supportedImports().contains(importStr); - bool isQQ2 = qq2.supportedImports().contains(importStr); - if (isQQ1 && ! isQQ2) - _doc->setLanguage(Language::QmlQtQuick1); - if (isQQ2 && ! isQQ1) - _doc->setLanguage(Language::QmlQtQuick2); + if (ModelManagerInterface::instance()) { + QmlLanguageBundles langBundles = ModelManagerInterface::instance()->extendedBundles(); + QmlBundle qq1 = langBundles.bundleForLanguage(Language::QmlQtQuick1); + QmlBundle qq2 = langBundles.bundleForLanguage(Language::QmlQtQuick2); + bool isQQ1 = qq1.supportedImports().contains(importStr); + bool isQQ2 = qq2.supportedImports().contains(importStr); + if (isQQ1 && ! isQQ2) + _doc->setLanguage(Language::QmlQtQuick1); + if (isQQ2 && ! isQQ1) + _doc->setLanguage(Language::QmlQtQuick2); + } } _imports += import; } else if (!ast->fileName.isEmpty()) { |