Fix lookup of shadowed parent properties

Consider the following example

Project {
    name: "project"
    property string projectName: name
    Product {
        name: "product"
        property string foo: projectName
    }
}

The foo property is supposed to have the value "project".
Instead it had the value "product".

EvaluatorScriptClass::property() and SVConverter assume that data->item
is the item that's attached to the QScriptValue object. That was not the
case when a property was automatically looked up in the parent item.

Task-number: QBS-1117
Change-Id: I21d4cc4106ae631730cd34fe352459d311b09501
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 9 insertions, 3 deletions

diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp
index c68a195bc..e42345094 100644
--- a/src/lib/corelib/language/evaluatorscriptclass.cpp
+++ b/src/lib/corelib/language/evaluatorscriptclass.cpp
@@ -376,6 +376,7 @@ QScriptClass::QueryFlags EvaluatorScriptClass::queryItemProperty(const Evaluatio
         parentdata.item = data->item->parent();
         const QueryFlags qf = queryItemProperty(&parentdata, name, true);
         if (qf.testFlag(HandlesReadAccess)) {
+            m_queryResult.foundInParent = true;
             m_queryResult.data = data;
             return qf;
         }
@@ -575,8 +576,10 @@ private:
 QScriptValue EvaluatorScriptClass::property(const QScriptValue &object, const QScriptString &name,
                                             uint id)
 {
+    const bool foundInParent = m_queryResult.foundInParent;
     const EvaluationData *data = m_queryResult.data;
     const Item * const itemOfProperty = m_queryResult.itemOfProperty;
+    m_queryResult.foundInParent = false;
     m_queryResult.data = 0;
     m_queryResult.itemOfProperty = 0;
     QBS_ASSERT(data, return QScriptValue());
@@ -612,7 +615,11 @@ QScriptValue EvaluatorScriptClass::property(const QScriptValue &object, const QS
     if (value->next() && !m_currentNextChain.contains(value.data())) {
         collectValuesFromNextChain(data, &result, name.toString(), value);
     } else {
-        SVConverter converter(this, &object, value, itemOfProperty, &name, data, &result);
+        QScriptValue parentObject;
+        if (foundInParent)
+            parentObject = data->evaluator->scriptValue(data->item->parent());
+        SVConverter converter(this, foundInParent ? &parentObject : &object, value, itemOfProperty,
+                              &name, data, &result);
         converter.start();
 
         const PropertyDeclaration decl = data->item->propertyDeclaration(name.toString());
diff --git a/src/lib/corelib/language/evaluatorscriptclass.h b/src/lib/corelib/language/evaluatorscriptclass.h
index c391baa8f..fe0b56215 100644
--- a/src/lib/corelib/language/evaluatorscriptclass.h
+++ b/src/lib/corelib/language/evaluatorscriptclass.h
@@ -94,6 +94,7 @@ private:
             return !data;
         }
 
+        bool foundInParent = false;
         const EvaluationData *data;
         const Item *itemOfProperty;     // The item that owns the property.
         ValuePtr value;
diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp
index bc712d672..79acf5583 100644
--- a/src/lib/corelib/language/tst_language.cpp
+++ b/src/lib/corelib/language/tst_language.cpp
@@ -1234,8 +1234,6 @@ void TestLanguage::moduleProperties()
     ResolvedProductPtr product = products.value(productName);
     QVERIFY(product);
     const QVariant value = product->moduleProperties->moduleProperty("dummy", propertyName);
-    QEXPECT_FAIL("shadowed-list-property", "QBS-1117", Continue);
-    QEXPECT_FAIL("shadowed-scalar-property", "QBS-1117", Continue);
     QCOMPARE(value, expectedValue);
 }