From eda93bde42c09529932619a01650829d519b8fab Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 15 Jul 2011 11:19:37 +0200
Subject: [PATCH] QmlJS: Fix type lookup issue.
0c0ffab1bbc56e6cc381eeba3dc1227793d766cd accidentally always returned
null if the type was not an enum.
Change-Id: Ie16d96e59cefa50c345cddb4a053fd8b60ba3cd6
Reviewed-on: http://codereview.qt.nokia.com/1693
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
---
src/libs/qmljs/qmljsinterpreter.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index b0fb630c877..1002f96162e 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -305,6 +305,9 @@ const Value *QmlObjectValue::propertyValue(const FakeMetaProperty &prop) const
value = valueOwner()->anchorLineValue();
}
+ if (value)
+ return value;
+
// might be an enum
const QmlObjectValue *base = this;
const QStringList components = typeName.split(QLatin1String("::"));
--
GitLab