diff options
| author | Richard Weickelt <richard@weickelt.de> | 2023-04-20 15:54:09 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2023-04-20 15:54:09 +0200 |
| commit | a8d2fba8eb4e736ad89f05056a4b4b127badf732 (patch) | |
| tree | 78bdee1f455b94add8e1893ba827c14ff370f78d | |
| parent | 02748c559938a90b9ea8ffc6544cc7fb65266239 (diff) | |
| parent | e002680feb415ee7d26e3a31d70afeef0d50dea2 (diff) | |
| download | qbs-a8d2fba8eb4e736ad89f05056a4b4b127badf732.tar.gz | |
Merge branch '2.0' into master
Change-Id: I483d3e0b7076c1df50594356da989d86fc0ec451
| -rw-r--r-- | src/lib/corelib/jsextensions/domxml.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/tools/scripttools.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/jsextensions/domxml.cpp b/src/lib/corelib/jsextensions/domxml.cpp index 84facc970..35cff186b 100644 --- a/src/lib/corelib/jsextensions/domxml.cpp +++ b/src/lib/corelib/jsextensions/domxml.cpp @@ -369,7 +369,7 @@ template<> XmlDomNode<QDomNode> *XmlDomNode<QDomDocument>::createTextNode(const template<> bool XmlDomNode<QDomDocument>::setContent(const QString &content) { - return m_value.setContent(content); + return static_cast<bool>(m_value.setContent(content)); } template<> QString XmlDomNode<QDomDocument>::toString(int indent) diff --git a/src/lib/corelib/tools/scripttools.cpp b/src/lib/corelib/tools/scripttools.cpp index b6d9b61a2..109b74486 100644 --- a/src/lib/corelib/tools/scripttools.cpp +++ b/src/lib/corelib/tools/scripttools.cpp @@ -232,6 +232,7 @@ JSValue makeJsVariant(JSContext *ctx, const QVariant &v) return makeJsVariantMap(ctx, v.toMap()); case QMetaType::QByteArray: QBS_ASSERT(!"QByteArray is not a valid type for JS variant", return JS_UNDEFINED); + [[fallthrough]]; default: return JS_UNDEFINED; } |