QmlJs: fix bug in resolving qml imports

The introduction of Controls.2 changed the way in which imports are
resolved. This patch fix some leftovers of the old resolution scheme.
Such leftovers caused false positives in import declaration to happen
when resetting the QML/JS code model.
The code has also been simplified a little, by the removal of
duplicate code and of unused methods.

Change-Id: I90bdf7ed47fdfea7cbd8259acd7a9a968f27301b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Benelli
2017-09-28 16:24:13 +02:00
parent 79bdd7e14f
commit c054dd2cff
3 changed files with 31 additions and 62 deletions

View File

@@ -178,7 +178,7 @@ public:
QList<ProjectInfo> allProjectInfosForPath(const QString &path) const;
bool isIdle() const ;
PathsAndLanguages importPaths() const;
QStringList importPathsNames() const;
QmlJS::QmlLanguageBundles activeBundles() const;
QmlJS::QmlLanguageBundles extendedBundles() const;