diff options
| author | Marco Benelli <[email protected]> | 2017-09-28 16:24:13 +0200 |
|---|---|---|
| committer | Marco Benelli <[email protected]> | 2017-10-16 11:10:17 +0000 |
| commit | c054dd2cffd1c42c1dc59d00c87a5008c3c229d1 (patch) | |
| tree | 61b2227dc0c486c6ac64896888601e32c2d0c9bb /src/libs/qmljs/qmljsmodelmanagerinterface.h | |
| parent | 79bdd7e14f3b3cc584c4a5911bf11e6fc835ca28 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.h')
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h index c86177d4879..430f4b880e6 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.h +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h @@ -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; |