Add new property type "varList"

While we could already assign arrays to variant properties, these would
not have list semantics when merging modules, so this fills a gap in our
type system.

[ChangeLog] Added new property type "varList".

Change-Id: I54581119f60582f2b11290e13cd4920fd72f55a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 9 insertions, 1 deletions

diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp
index 5a0eec865..3c276956f 100644
--- a/src/lib/corelib/language/evaluatorscriptclass.cpp
+++ b/src/lib/corelib/language/evaluatorscriptclass.cpp
@@ -131,7 +131,8 @@ private:
                 = itemOfProperty->propertyDeclaration(propertyName->toString()).type();
         const bool isArray = type == PropertyDeclaration::StringList
                 || type == PropertyDeclaration::PathList
-                || type == PropertyDeclaration::Variant;
+                || type == PropertyDeclaration::Variant // TODO: Why?
+                || type == PropertyDeclaration::VariantList;
         QScriptValue valueToSet = scriptValue;
         if (isArray) {
             if (!valueToSet.isValid() || valueToSet.isUndefined())
@@ -561,6 +562,13 @@ static void convertToPropertyType_impl(const QString &pathPropertiesBaseDir, con
         }
         break;
     }
+    case PropertyDeclaration::VariantList:
+        if (!v.isArray()) {
+            QScriptValue x = v.engine()->newArray(1);
+            x.setProperty(0, v);
+            v = x;
+        }
+        break;
     }
 }