diff options
| author | Fawzi Mohamed <fawzi.mohamed@theqtcompany.com> | 2015-02-05 17:26:30 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@theqtcompany.com> | 2015-02-16 15:15:33 +0000 |
| commit | 6a120df7f7a29a426448730e7b7cbb103a80654b (patch) | |
| tree | d76b65fa5ded94638ac20145c6bd85f57df26188 | |
| parent | b3f049aa7d4024f930542c08fe79790559abcb7e (diff) | |
| download | qt-creator-6a120df7f7a29a426448730e7b7cbb103a80654b.tar.gz | |
qmljs: do not look up types in the prototypes
looking up types in prototypes leads to a recursive blowup when resolving
the prototype of a type returns (for incorrect code) the type itself.
Change-Id: Iebcbdda7554e5fe01f0ef323ccc2079888c7ef4e
Task-number: QTCREATORBUG-13906
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| -rw-r--r-- | src/libs/qmljs/qmljscontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljscontext.cpp b/src/libs/qmljs/qmljscontext.cpp index 61cced97f2..f81cf2dccc 100644 --- a/src/libs/qmljs/qmljscontext.cpp +++ b/src/libs/qmljs/qmljscontext.cpp @@ -116,7 +116,7 @@ const ObjectValue *Context::lookupType(const QmlJS::Document *doc, UiQualifiedId for (UiQualifiedId *iter = qmlTypeName; objectValue && iter && iter != qmlTypeNameEnd; iter = iter->next) { - const Value *value = objectValue->lookupMember(iter->name.toString(), this); + const Value *value = objectValue->lookupMember(iter->name.toString(), this, 0, false); if (!value) return 0; |