Fix parameter extraction for Depends items within Export/Module items

Parameters of Depends items within Export items were ignored.

Project {
    Product {
        name: "foo"
        Export {
            Depends { name: "dep"; cpp.link: false }    // dep
        }
    }
    Product {
        name: "bar"
        Depends { name: "foo" }
    }
}

The instance of foo in bar has an Depends child depinst. The item
depinst was created by createChildInstances and is an empty item with
the prototype dep, which is the Depends item in foo's Export item.

Thus, extractParameters must look up properties in the deepest
prototype (dep), not in the Depends item itself (depinst).

Unfortunately, this fix triggers
SOFT ASSERT: varValue in ../../../../1.10/src/lib/corelib/language/evaluatorscriptclass.cpp:574
which will be fixed separately.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 1feac1be1..f2dae2cf9 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -2274,7 +2274,8 @@ static QVariantMap safeToVariant(const QScriptValue &v)
 QVariantMap ModuleLoader::extractParameters(Item *dependsItem) const
 {
     QVariantMap result;
-    const Item::PropertyMap &itemProperties = filterItemProperties(dependsItem->properties());
+    const Item::PropertyMap &itemProperties = filterItemProperties(
+                rootPrototype(dependsItem)->properties());
     if (itemProperties.isEmpty())
         return result;