Merge branch '2.0' into master

Change-Id: I3ee32bc62c313a525fe46949a4d99f97bf2d8946

4 files changed, 54 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs
index ec46938ab..c138e46c0 100644
--- a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs
+++ b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs
@@ -33,6 +33,7 @@ Project {
             property string dummy: product.linkWholeArchive // To force probe re-execution
             configure: {
                 if (!toolchain.includes("msvc")
+                        || toolchain.includes("clang-cl")
                         || Utilities.versionCompare(compilerVersion, "19.0.24215.1") >= 0) {
                     console.info("can link whole archives");
                 } else {
diff --git a/tests/auto/language/testdata/throw.qbs b/tests/auto/language/testdata/throw.qbs
new file mode 100644
index 000000000..e9a97efb5
--- /dev/null
+++ b/tests/auto/language/testdata/throw.qbs
@@ -0,0 +1,16 @@
+Project {
+    property string throwType
+    property bool dummy: {
+        if (throwType === "bool")
+            throw true;
+        if (throwType === "int")
+            throw 43;
+        if (throwType === "string")
+            throw "an error";
+        if (throwType === "list")
+            throw ["an", "error"];
+        if (throwType === "object")
+            throw { result: "crash", reason: "overheating" };
+        throw "type missing";
+    }
+}
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index c97b83cc1..6b7850214 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -65,6 +65,7 @@
 #include <tools/settings.h>
 #include <tools/stlutils.h>
 
+#include <QtCore/qjsonobject.h>
 #include <QtCore/qprocess.h>
 
 #include <algorithm>
@@ -370,6 +371,40 @@ void TestLanguage::rfc1034Identifier()
     QCOMPARE(exceptionCaught, false);
 }
 
+void TestLanguage::throwThings_data()
+{
+    QTest::addColumn<QString>("type");
+    QTest::addColumn<QString>("result");
+    QTest::addRow("bool") << "bool" << "true";
+    QTest::addRow("int") << "int" << "43";
+    QTest::addRow("string") << "string" << "an error";
+    QTest::addRow("list") << "list" << R"([
+    "an",
+    "error"
+])";
+    QTest::addRow("object") << "object" << R"({
+    "reason": "overheating",
+    "result": "crash"
+})";
+}
+
+void TestLanguage::throwThings()
+{
+    QFETCH(QString, type);
+    QFETCH(QString, result);
+    bool exceptionCaught = false;
+    try {
+        SetupProjectParameters params = defaultParameters;
+        params.setProjectFilePath(testProject("throw.qbs"));
+        params.setOverriddenValues({{"project.throwType", type}});
+        m_resolver->resolve(params);
+    } catch (const ErrorInfo &e) {
+        exceptionCaught = true;
+        QVERIFY2(e.toString().contains(result), qPrintable(e.toString()));
+    }
+    QVERIFY(exceptionCaught);
+}
+
 void TestLanguage::conditionalDepends()
 {
     bool exceptionCaught = false;
diff --git a/tests/auto/language/tst_language.h b/tests/auto/language/tst_language.h
index 1229157b2..738d94c58 100644
--- a/tests/auto/language/tst_language.h
+++ b/tests/auto/language/tst_language.h
@@ -180,6 +180,8 @@ private slots:
     void qualifiedId();
     void recursiveProductDependencies();
     void rfc1034Identifier();
+    void throwThings_data();
+    void throwThings();
     void useInternalProfile();
     void versionCompare();
     void wildcards_data();