summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/corelib/jsextensions/domxml.cpp2
-rw-r--r--src/lib/corelib/tools/scripttools.cpp1
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;
}