Merge 2.0 into master

Change-Id: I7c59b6c7dc914f8af295457babbcb8b2b2685546

4 files changed, 23 insertions, 3 deletions

diff --git a/changelogs/changes-2.0.0.md b/changelogs/changes-2.0.0.md
new file mode 100644
index 000000000..52bfada7c
--- /dev/null
+++ b/changelogs/changes-2.0.0.md
@@ -0,0 +1,16 @@
+# General
+* Switched JavaScript engine from QtScript to QuickJS
+* Removed the long-deprecated loadFile() and loadExtension() functions
+* Removed the qmake project files
+
+# BareMetal support
+* Added support for HPPA architectures
+
+# Infrastructure
+* Added USBSAN CI job
+
+# Contributors
+* Christian Kandeler
+* Ivan Komissarov
+* Orgad Shaneh
+* Pino Toscano
diff --git a/doc/reference/items/language/export.qdoc b/doc/reference/items/language/export.qdoc
index 96abde2ed..e3648fc3e 100644
--- a/doc/reference/items/language/export.qdoc
+++ b/doc/reference/items/language/export.qdoc
@@ -109,7 +109,7 @@
     project against it), you would write something like the following:
     \code
     Export {
-        Depends { name: cpp" }
+        Depends { name: "cpp" }
         cpp.includePaths: [exportingProduct.sourceDirectory]
         prefixMapping: [{
                 prefix: exportingProduct.sourceDirectory,
diff --git a/share/qbs/modules/codesign/codesign.js b/share/qbs/modules/codesign/codesign.js
index 463e7cbb7..80b82f1ce 100644
--- a/share/qbs/modules/codesign/codesign.js
+++ b/share/qbs/modules/codesign/codesign.js
@@ -45,8 +45,10 @@ function findSigningIdentities(searchString, team) {
         var identity = identities[key];
         if (team && ![identity.subjectInfo.O, identity.subjectInfo.OU].contains(team))
             continue;
-        if (searchString === key || identity.subjectInfo.CN.startsWith(searchString))
+        if (searchString === key
+                || (identity.subjectInfo.CN && identity.subjectInfo.CN.startsWith(searchString))) {
             matchedIdentities[key] = identity;
+        }
     }
     return matchedIdentities;
 }
diff --git a/src/lib/corelib/jsextensions/propertylist_darwin.mm b/src/lib/corelib/jsextensions/propertylist_darwin.mm
index 69aeefd92..97e8f6209 100644
--- a/src/lib/corelib/jsextensions/propertylist_darwin.mm
+++ b/src/lib/corelib/jsextensions/propertylist_darwin.mm
@@ -94,7 +94,9 @@ private:
     void readFromData(const QByteArray &data);
     void writeToFile(const QString &filePath, const QString &plistFormat);
     std::optional<QString> format() const;
-    QVariant toObject() const { return m_propertyListObject; }
+    QVariant toObject() const {
+        return m_propertyListObject.isNull() ? QVariantMap() : m_propertyListObject;
+    }
     QString toString(const QString &plistFormat) const;
     QString toXMLString() const;
     QString toJSON(const QString &style = QString()) const;