From 4de3f91a61b78de2097c1f7d7d2e59a78f731cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= Date: Fri, 14 Apr 2023 10:32:18 +0200 Subject: Fix build with Qt6.5 QDomDocument::setContent received new overloads which do not return a bool, but a QDomDocument::ParseResult, which can be converted to bool. Thus the static_cast is enough and shouldn't bother builds with Qt < 6.5. Change-Id: I2ef334503b853adc6fe54fd739321b22a4ba6721 Reviewed-by: Ivan Komissarov --- src/lib/corelib/jsextensions/domxml.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 *XmlDomNode::createTextNode(const template<> bool XmlDomNode::setContent(const QString &content) { - return m_value.setContent(content); + return static_cast(m_value.setContent(content)); } template<> QString XmlDomNode::toString(int indent) -- cgit v1.2.1 From e002680feb415ee7d26e3a31d70afeef0d50dea2 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 14 Apr 2023 11:17:33 +0200 Subject: Fix compiler warning Change-Id: I16c1373e21db71a47be45bfebaeca91084e1b067 Reviewed-by: Ivan Komissarov --- src/lib/corelib/tools/scripttools.cpp | 1 + 1 file changed, 1 insertion(+) 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; } -- cgit v1.2.1