fix module property cache

When caching module properties, we must take into account whether
we're requesting one or multiple values. Otherwise we might get
the wrong cached result.

Task-number: QBS-539

Change-Id: I9ca17d3a537922f37dc70be4dbfd73416b6bdfc3
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp
index 93aab3975..b8a2d27d8 100644
--- a/src/lib/corelib/jsextensions/moduleproperties.cpp
+++ b/src/lib/corelib/jsextensions/moduleproperties.cpp
@@ -124,7 +124,8 @@ QScriptValue ModuleProperties::moduleProperties(QScriptContext *context, QScript
     const QString moduleName = internalModuleName(context->argument(0).toString());
     const QString propertyName = context->argument(1).toString();
 
-    QVariant value = qbsEngine->retrieveFromPropertyCache(moduleName, propertyName, properties);
+    QVariant value = qbsEngine->retrieveFromPropertyCache(moduleName, propertyName, oneValue,
+                                                          properties);
     if (!value.isValid()) {
         if (oneValue)
             value = PropertyFinder().propertyValue(properties->value(), moduleName, propertyName);
@@ -138,7 +139,7 @@ QScriptValue ModuleProperties::moduleProperties(QScriptContext *context, QScript
 
         // Cache the variant value. We must not cache the QScriptValue here, because it's a
         // reference and the user might change the actual object.
-        qbsEngine->addToPropertyCache(moduleName, propertyName, properties, value);
+        qbsEngine->addToPropertyCache(moduleName, propertyName, oneValue, properties, value);
     }
     return engine->toScriptValue(value);
 }