Fix accessing product properties via the "product" property.

Also add an autotest for this.

Change-Id: If4d3bf50eee4d77dcac12c1cf574dc08780c3dae
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/src/lib/buildgraph/buildgraph.cpp b/src/lib/buildgraph/buildgraph.cpp
index 30bb71b16..1f43edbb1 100644
--- a/src/lib/buildgraph/buildgraph.cpp
+++ b/src/lib/buildgraph/buildgraph.cpp
@@ -86,8 +86,15 @@ void setupScriptEngineForProduct(ScriptEngine *engine, const ResolvedProductCons
         if (destinationDirectory.isEmpty())
             destinationDirectory = ".";
         productScriptValue.setProperty("destinationDirectory", destinationDirectory);
+
         exportProperty(product, productScriptValue, engine, "type");
         exportProperty(product, productScriptValue, engine, "consoleApplication");
+        const QVariantMap &propMap = product->properties->value();
+        for (QVariantMap::ConstIterator it = propMap.constBegin(); it != propMap.constEnd(); ++it) {
+            if (!it.value().canConvert<QVariantMap>())
+                productScriptValue.setProperty(it.key(), engine->toScriptValue(it.value()));
+        }
+
         targetObject.setProperty("product", productScriptValue);
     } else {
         productScriptValue = targetObject.property("product");