summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljsinterpreter.cpp
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-09-29 11:48:13 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2011-10-12 08:49:30 +0200
commit038111c384e79d20faa33e52a9bbbc8999ad695b (patch)
tree0d0b680bf6bfabbcc8f4b16f9b8ed31dbe6d11db /src/libs/qmljs/qmljsinterpreter.cpp
parentf3c78d352276f01035d79f0a97cfe88f43b30374 (diff)
downloadqt-creator-038111c384e79d20faa33e52a9bbbc8999ad695b.tar.gz
QmlJS checks: Disable some checks when imports failed.
The important error in this case is on the import. Change-Id: I3a547ca7ac44a89aba6819ea80ec52185071408a Reviewed-on: http://codereview.qt-project.org/5879 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsinterpreter.cpp')
-rw-r--r--src/libs/qmljs/qmljsinterpreter.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index d3b3ecd109..fab7b6ef6a 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -2141,6 +2141,7 @@ void JSImportScope::processMembers(MemberProcessor *processor) const
Imports::Imports(ValueOwner *valueOwner)
: _typeScope(new TypeScope(this, valueOwner))
, _jsImportScope(new JSImportScope(this, valueOwner))
+ , _importFailed(false)
{}
void Imports::append(const Import &import)
@@ -2159,6 +2160,14 @@ void Imports::append(const Import &import)
// not found, append
_imports.append(import);
}
+
+ if (!import.valid)
+ _importFailed = true;
+}
+
+void Imports::setImportFailed()
+{
+ _importFailed = true;
}
ImportInfo Imports::info(const QString &name, const Context *context) const
@@ -2219,6 +2228,11 @@ QString Imports::nameForImportedObject(const ObjectValue *value, const Context *
return QString();
}
+bool Imports::importFailed() const
+{
+ return _importFailed;
+}
+
QList<Import> Imports::all() const
{
return _imports;