diff options
| -rw-r--r-- | src/libs/qmljs/qmljsinterpreter.cpp | 6 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljsinterpreter.h | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index fbf5725a02..b4165cdba0 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -2312,8 +2312,10 @@ const Value *TypeScope::lookupMember(const QString &name, const Context *context continue; } - if (const Value *v = import->lookupMember(name, context, foundInObject)) + if (const Value *v = import->lookupMember(name, context, foundInObject)) { + i.used = true; return v; + } } if (foundInObject) *foundInObject = 0; @@ -2491,7 +2493,7 @@ bool Imports::importFailed() const return m_importFailed; } -QList<Import> Imports::all() const +const QList<Import> &Imports::all() const { return m_imports; } diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index 230d9f03f0..01bb184d5b 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -1038,7 +1038,7 @@ public: QString nameForImportedObject(const ObjectValue *value, const Context *context) const; bool importFailed() const; - QList<Import> all() const; + const QList<Import> &all() const; const TypeScope *typeScope() const; const JSImportScope *jsImportScope() const; diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 9700195427..b13e359c93 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -868,7 +868,6 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH setupImports(doc, differenceHandler); setupPossibleImports(snapshot, vContext); - setupUsedImports(); if (m_rewriterView->model()->imports().isEmpty()) { const QmlJS::DiagnosticMessage diagnosticMessage(QmlJS::Severity::Error, AST::SourceLocation(0, 0, 0, 0), QCoreApplication::translate("QmlDesigner::TextToModelMerger", "No import statements found")); @@ -944,6 +943,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH } } } + setupUsedImports(); UiObjectMember *astRootNode = 0; if (UiProgram *program = doc->qmlProgram()) |