diff options
| author | Marco Benelli <marco.benelli@qt.io> | 2018-01-08 11:14:05 +0100 |
|---|---|---|
| committer | Marco Benelli <marco.benelli@qt.io> | 2018-01-08 13:15:23 +0000 |
| commit | d11e31230cd09a7777af60fb3aa04995fea3bb16 (patch) | |
| tree | 667270e94d67648df59de001995b48229e2af482 /src/libs/qmljs | |
| parent | fdf95a2fe7d683f7532ef8d075171f074747e7e1 (diff) | |
QmlJs: remove bundles for QtQuick1 type descriptions
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>
Diffstat (limited to 'src/libs/qmljs')
| -rw-r--r-- | src/libs/qmljs/qmljsbind.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp index 7fc996d5115..f823aff50bf 100644 --- a/src/libs/qmljs/qmljsbind.cpp +++ b/src/libs/qmljs/qmljsbind.cpp @@ -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); } } |