From ba95b9d0f3c1b0df741d7c836c126df9135fcd60 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 7 Feb 2023 10:34:56 +0100 Subject: Add change log for 2.0.0 Change-Id: If93dc493a982247ed20c93df90ffebbc05bb64d5 Reviewed-by: Ivan Komissarov --- changelogs/changes-2.0.0.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 changelogs/changes-2.0.0.md 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 -- cgit v1.2.1 From d88b1c58bf205abd71c11b36dbf7059e7b5721aa Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Wed, 8 Feb 2023 10:17:12 +0300 Subject: doc: fix typo Change-Id: Icaa492b0fee01d37a4cf1940e6d8f456b532abbc Reviewed-by: Christian Kandeler --- doc/reference/items/language/export.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- cgit v1.2.1 From 4c79b659b080d00feed2cc117e323eb0e61771b4 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 8 Feb 2023 17:52:01 +0100 Subject: codesign: Add missing check for undefined value Change-Id: I68424e794138982f71c3340cc4aba8227403abb8 Reviewed-by: Ivan Komissarov --- share/qbs/modules/codesign/codesign.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.1 From 7cbd3803c32ed8c0141e9dd3d116df3d84d72e84 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 9 Feb 2023 10:46:13 +0100 Subject: PropertyList: Do not return undefined from toObject() Change-Id: Ie1981dd23ca5a4d35a9f63d84efce30c5eed01f4 Reviewed-by: Maximilian Hrabowski Reviewed-by: Ivan Komissarov --- src/lib/corelib/jsextensions/propertylist_darwin.mm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 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; -- cgit v1.2.1