Merge 1.6 into master

Change-Id: Ie98233d955f3695da0b20069fb2317931e353e4e

7 files changed, 112 insertions, 16 deletions

diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp
index 7ca472364..e7d5a3647 100644
--- a/src/lib/corelib/language/evaluatorscriptclass.cpp
+++ b/src/lib/corelib/language/evaluatorscriptclass.cpp
@@ -422,11 +422,17 @@ static void makeTypeError(const PropertyDeclaration &decl, const CodeLocation &l
 }
 
 static void convertToPropertyType(const Item *item, const PropertyDeclaration& decl,
-                                  const CodeLocation &location, QScriptValue &v)
+                                  const Value *value, QScriptValue &v)
 {
+    if (value->type() == Value::VariantValueType && v.isUndefined() && !decl.isScalar()) {
+        v = v.engine()->newArray(); // QTBUG-51237
+        return;
+    }
+
     if (v.isUndefined() || v.isError())
         return;
     QString srcDir;
+    const CodeLocation &location = value->location();
     switch (decl.type()) {
     case PropertyDeclaration::UnknownType:
     case PropertyDeclaration::Variant:
@@ -537,7 +543,7 @@ QScriptValue EvaluatorScriptClass::property(const QScriptValue &object, const QS
         converter.start();
 
         const PropertyDeclaration decl = data->item->propertyDeclaration(name.toString());
-        convertToPropertyType(data->item, decl, value->location(), result);
+        convertToPropertyType(data->item, decl, value.data(), result);
     }
 
     if (debugProperties)
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index eeb33662b..2b180e920 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -1144,7 +1144,12 @@ QVariantMap ProjectResolver::evaluateProperties(Item *item, Item *propertiesCont
             if (result.contains(it.key()))
                 break;
             VariantValuePtr vvp = it.value().staticCast<VariantValue>();
-            result[it.key()] = vvp->value();
+            QVariant v = vvp->value();
+
+            if (v.isNull() && !item->propertyDeclaration(it.key()).isScalar()) // QTBUG-51237
+                v = QStringList();
+
+            result[it.key()] = v;
             break;
         }
         }
diff --git a/src/lib/corelib/language/testdata/modulepropertiesingroups.qbs b/src/lib/corelib/language/testdata/modulepropertiesingroups.qbs
index 6bfbf42d3..22fb750e4 100644
--- a/src/lib/corelib/language/testdata/modulepropertiesingroups.qbs
+++ b/src/lib/corelib/language/testdata/modulepropertiesingroups.qbs
@@ -3,11 +3,34 @@ import qbs 1.0
 Project {
     Product {
         name: "grouptest"
+
+        Depends { name: "gmod1" }
         Depends { name: "dummyqt.core" }
+
+        gmod1.listProp2: ["product", gmod1.stringProp]
+        gmod1.p1: 1
+
+        // TODO: Also test nested groups in >= 1.7
         Group  {
-            name: "thegroup"
+            name: "g1"
             files: ["Banana"]
+
+            gmod1.stringProp: "g1"
+            gmod1.listProp2: ["g1"]
+            gmod1.p2: 2
+            gmod2.prop: 1
             dummyqt.core.zort: "X"
         }
+
+        Group  {
+            name: "g2"
+            files: ["zort"]
+
+            gmod1.stringProp: "g2"
+            gmod1.listProp2: ["g2"]
+            gmod1.p1: 2
+            gmod1.p2: 4
+            gmod2.prop: 2
+        }
     }
 }
diff --git a/src/lib/corelib/language/testdata/modules/gmod1/gmod1.qbs b/src/lib/corelib/language/testdata/modules/gmod1/gmod1.qbs
new file mode 100644
index 000000000..416372e3d
--- /dev/null
+++ b/src/lib/corelib/language/testdata/modules/gmod1/gmod1.qbs
@@ -0,0 +1,12 @@
+import qbs
+
+Module {
+    Depends { name: "gmod2" }
+    property stringList listProp1: ["prototype", stringProp]
+    property stringList listProp2: ["prototype"]
+    property string stringProp: "prototype"
+    property int depProp: gmod2.prop
+    property int p0: p1 + p2
+    property int p1: 0
+    property int p2: 0
+}
diff --git a/src/lib/corelib/language/testdata/modules/gmod2/gmod2.qbs b/src/lib/corelib/language/testdata/modules/gmod2/gmod2.qbs
new file mode 100644
index 000000000..208f7330d
--- /dev/null
+++ b/src/lib/corelib/language/testdata/modules/gmod2/gmod2.qbs
@@ -0,0 +1,5 @@
+import qbs
+
+Module {
+    property int prop: 0
+}
diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp
index 6647089ee..ccea88737 100644
--- a/src/lib/corelib/language/tst_language.cpp
+++ b/src/lib/corelib/language/tst_language.cpp
@@ -1129,21 +1129,62 @@ void TestLanguage::modulePropertiesInGroups()
         const QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
         const ResolvedProductPtr product = products.value("grouptest");
         QVERIFY(product);
-        GroupConstPtr group;
+        GroupConstPtr g1;
+        GroupConstPtr g2;
         foreach (const GroupConstPtr &g, product->groups) {
-            if (g->name == "thegroup") {
-                group = g;
-                break;
-            }
+            if (g->name == "g1")
+                g1= g;
+            else if (g->name == "g2")
+                g2 = g;
         }
-        QVERIFY(group);
-        QVariantList values = PropertyFinder().propertyValue(group->properties->value(),
-                                                             "dummy", "cFlags").toList();
-        QStringList valueStrings;
-        foreach (const QVariant &v, values)
-            valueStrings += v.toString();
+        QVERIFY(g1);
+        QVERIFY(g2);
+
+        const QVariantMap productProps = product->moduleProperties->value();
+        PropertyFinder pf;
+
+        const auto &productListProp1 = pf.propertyValue(productProps, "gmod1", "listProp1")
+                .toStringList();
+        QCOMPARE(productListProp1, QStringList() << "prototype" << "prototype");
+        const auto &productListProp2 = pf.propertyValue(productProps, "gmod1", "listProp2")
+                .toStringList();
+        QCOMPARE(productListProp2, QStringList() << "product" << "prototype" << "prototype");
+        const int productP0 = pf.propertyValue(productProps, "gmod1", "p0").toInt();
+        QCOMPARE(productP0, 1);
+        const int productDepProp = pf.propertyValue(productProps, "gmod1", "depProp").toInt();
+        QCOMPARE(productDepProp, 0);
+
+        const QVariantMap g1Props = g1->properties->value();
+        const auto &g1ListProp1 = pf.propertyValue(g1Props, "gmod1", "listProp1")
+                .toStringList();
+        QCOMPARE(g1ListProp1, QStringList() << "prototype" << "g1");
+        const auto &g1ListProp2 = pf.propertyValue(g1Props, "gmod1", "listProp2")
+                .toStringList();
+        QEXPECT_FAIL(0, "QBS-1005", Continue);
+        QCOMPARE(g1ListProp2, QStringList() << "product" << "g1" << "prototype");
+        const int g1P0 = pf.propertyValue(g1Props, "gmod1", "p0").toInt();
+        QCOMPARE(g1P0, 3);
+        const int g1DepProp = pf.propertyValue(g1Props, "gmod1", "depProp").toInt();
+        QEXPECT_FAIL(0, "QBS-1005", Continue);
+        QCOMPARE(g1DepProp, 1);
+        const auto &g1DummyCFlags = pf.propertyValue(g1Props, "dummy", "cFlags")
+                .toStringList();
+        QEXPECT_FAIL(0, "QBS-1005", Continue);
+        QCOMPARE(g1DummyCFlags, QStringList("X"));
+
+        const QVariantMap g2Props = g2->properties->value();
+        const auto &g2ListProp1 = pf.propertyValue(g2Props, "gmod1", "listProp1")
+                .toStringList();
+        QCOMPARE(g2ListProp1, QStringList() << "prototype" << "g2");
+        const auto &g2ListProp2 = pf.propertyValue(g2Props, "gmod1", "listProp2")
+                .toStringList();
+        QEXPECT_FAIL(0, "QBS-1005", Continue);
+        QCOMPARE(g2ListProp2, QStringList() << "product" << "g2" << "prototype");
+        const int g2P0 = pf.propertyValue(g2Props, "gmod1", "p0").toInt();
+        QCOMPARE(g2P0, 6);
+        const int g2DepProp = pf.propertyValue(g2Props, "gmod1", "depProp").toInt();
         QEXPECT_FAIL(0, "QBS-1005", Continue);
-        QCOMPARE(valueStrings, QStringList("X"));
+        QCOMPARE(g2DepProp, 2);
     } catch (const ErrorInfo &e) {
         exceptionCaught = true;
         qDebug() << e.toString();
diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp
index 258699dfb..ce3a540a4 100644
--- a/src/lib/corelib/tools/msvcinfo.cpp
+++ b/src/lib/corelib/tools/msvcinfo.cpp
@@ -160,6 +160,9 @@ static QVariantMap getMsvcDefines(const QString &hostCompilerFilePath,
     }
     DummyFile actualDummyFile(actualDummyFilePath);
     const QString qbsClFrontend = nativeDummyFilePath + QStringLiteral(".exe");
+    const QString qbsClFrontendObj = nativeDummyFilePath + QStringLiteral(".obj");
+    DummyFile actualQbsClFrontend(qbsClFrontend);
+    DummyFile actualQbsClFrontendObj(qbsClFrontendObj);
 
     // The host compiler is the x86 compiler, which will execute on any edition of Windows
     // for which host compilers have been released so far (x86, x86_64, ia64)
@@ -171,6 +174,7 @@ static QVariantMap getMsvcDefines(const QString &hostCompilerFilePath,
     runProcess(hostCompilerFilePath, QStringList()
                << QStringLiteral("/nologo")
                << QStringLiteral("/TC")
+               << (QStringLiteral("/Fo") + qbsClFrontendObj)
                << nativeDummyFilePath
                << QStringLiteral("/link")
                << (QStringLiteral("/out:") + qbsClFrontend), msvc2.environments[QString()]);