From e8cfca002a56150d01c37de5951dd57acf9fd615 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sun, 20 Jul 2025 14:11:29 -0500 Subject: [PATCH] App: Update setContent call for Qt 6.8 --- src/App/Branding.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/App/Branding.cpp b/src/App/Branding.cpp index a319615b74..10789dde5c 100644 --- a/src/App/Branding.cpp +++ b/src/App/Branding.cpp @@ -103,19 +103,24 @@ Branding::XmlConfig Branding::getUserDefines() const bool Branding::evaluateXML(QIODevice* device, QDomDocument& xmlDocument) { +#if QT_VERSION >= QT_VERSION_CHECK(6,5,0) + if (!xmlDocument.setContent(device)) { + return false; + } +#else QString errorStr; int errorLine; int errorColumn; - if (!xmlDocument.setContent(device, true, &errorStr, &errorLine, &errorColumn)) { return false; } +#endif QDomElement root = xmlDocument.documentElement(); if (root.tagName() != QLatin1String("Branding")) { return false; } - else if (root.hasAttribute(QLatin1String("version"))) { + if (root.hasAttribute(QLatin1String("version"))) { QString attr = root.attribute(QLatin1String("version")); if (attr != QLatin1String("1.0")) { return false;