feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJs: remove bundles for QtQuick1 type descriptions

Browse Source 
QtCreator now assumes that QtQuick2 is used, so the relevant bundle is
loaded unconditionally.

Change-Id: Ib6b7b0c9a949e74edf0e0b7f68b0c774d7bcb451
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Benelli
2018-01-08 11:14:05 +01:00
parent fdf95a2fe7
commit d11e31230c
4 changed files with 21 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmljs/qmljsbind.cpp
View File

@@ -202,13 +202,9 @@ bool Bind::visit(UiImport *ast)
const QString importStr = import.name() + importId;
if (ModelManagerInterface::instance()) {
QmlLanguageBundles langBundles = ModelManagerInterface::instance()->extendedBundles();
QmlBundle qq1 = langBundles.bundleForLanguage(Dialect::QmlQtQuick1);
QmlBundle qq2 = langBundles.bundleForLanguage(Dialect::QmlQtQuick2);
bool isQQ1 = qq1.supportedImports().contains(importStr);
bool isQQ2 = qq2.supportedImports().contains(importStr);
if (isQQ1 && ! isQQ2)
_doc->setLanguage(Dialect::QmlQtQuick1);
if (isQQ2 && ! isQQ1)
if (isQQ2)
_doc->setLanguage(Dialect::QmlQtQuick2);
}
}