Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-svg for openSUSE:Factory checked in at 2024-05-27 11:45:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-svg (Old) and /work/SRC/openSUSE:Factory/.qt6-svg.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-svg" Mon May 27 11:45:17 2024 rev:32 rq:1176075 version:6.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-svg/qt6-svg.changes 2024-04-08 17:43:32.154331240 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-svg.new.24587/qt6-svg.changes 2024-05-27 11:46:47.809873296 +0200 @@ -1,0 +2,6 @@ +Tue May 21 08:31:48 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.7.1: + * https://www.qt.io/blog/qt-6.7.1-released + +------------------------------------------------------------------- Old: ---- qtsvg-everywhere-src-6.7.0.tar.xz New: ---- qtsvg-everywhere-src-6.7.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-svg.spec ++++++ --- /var/tmp/diff_new_pack.W1Q6fU/_old 2024-05-27 11:46:49.885949370 +0200 +++ /var/tmp/diff_new_pack.W1Q6fU/_new 2024-05-27 11:46:49.889949517 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.0 +%define real_version 6.7.1 %define short_version 6.7 %define tar_name qtsvg-everywhere-src %define tar_suffix %{nil} @@ -27,12 +27,12 @@ %endif # Name: qt6-svg%{?pkg_suffix} -Version: 6.7.0 +Version: 6.7.1 Release: 0 Summary: Classes for rendering and displaying SVG drawings License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) URL: https://www.qt.io -Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz +Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-svg-rpmlintrc BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel ++++++ qtsvg-everywhere-src-6.7.0.tar.xz -> qtsvg-everywhere-src-6.7.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/.cmake.conf new/qtsvg-everywhere-src-6.7.1/.cmake.conf --- old/qtsvg-everywhere-src-6.7.0/.cmake.conf 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/.cmake.conf 2024-05-08 20:41:42.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.0") +set(QT_REPO_MODULE_VERSION "6.7.1") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/.tag new/qtsvg-everywhere-src-6.7.1/.tag --- old/qtsvg-everywhere-src-6.7.0/.tag 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/.tag 2024-05-08 20:41:42.000000000 +0200 @@ -1 +1 @@ -85eeb5aecff1ad3e16b8ce960a5bfafc05df4461 +7ed85b2bd5c2444938f3c0d0a5a34e125fbda3a8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/dependencies.yaml new/qtsvg-everywhere-src-6.7.1/dependencies.yaml --- old/qtsvg-everywhere-src-6.7.0/dependencies.yaml 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/dependencies.yaml 2024-05-08 20:41:42.000000000 +0200 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 98602c26fc97eb41e3dd7548194ca637420a31b9 + ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/licenseRule.json new/qtsvg-everywhere-src-6.7.1/licenseRule.json --- old/qtsvg-everywhere-src-6.7.0/licenseRule.json 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/licenseRule.json 2024-05-08 20:41:42.000000000 +0200 @@ -0,0 +1,84 @@ +[ + { + "comment" : ["file_pattern_ending: strings matched against the end of a file name.", + "location keys: regular expression matched against the beginning of", + "the file path (relative to the git submodule root).", + "spdx: list of SPDX-License-Expression's allowed in the matching files.", + "-------------------------------------------------------", + "Files with the following endings are Build System licensed,", + "unless they are examples", + "Files with other endings can also be build system files" + ], + "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", + "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"], + "location" : { + "" : { + "comment" : "Default", + "file type" : "build system", + "spdx" : ["BSD-3-Clause"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comments" : ["Files with the following endings are Tool licensed,", + "unless they are examples.", + "Files with other endings can also be tool files."], + "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], + "location" :{ + "" : { + "comment" : "Default", + "file type" : "tools and utils", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comment" : "Files with the following endings are Documentation licensed.", + "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], + "location" :{ + "" : { + "comment" : "", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + } + } + }, + { + "comment" : ["All other files", + "The licensing is defined only by the file location in the Qt module repository.", + "NO <file_pattern_ending> key for this case!", + "This needs to be the last entry of the file."], + "location" : { + "" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "src/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "tests/" : { + "comment" : "Default", + "file type" : "test", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Default", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + } +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/src/svg/doc/src/qsvgglobal.qdoc new/qtsvg-everywhere-src-6.7.1/src/svg/doc/src/qsvgglobal.qdoc --- old/qtsvg-everywhere-src-6.7.0/src/svg/doc/src/qsvgglobal.qdoc 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/src/svg/doc/src/qsvgglobal.qdoc 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \namespace QtSvg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/src/svg/qsvghandler.cpp new/qtsvg-everywhere-src-6.7.1/src/svg/qsvghandler.cpp --- old/qtsvg-everywhere-src-6.7.0/src/svg/qsvghandler.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/src/svg/qsvghandler.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -3148,6 +3148,10 @@ x = parseLength(xStr.toString(), &type, handler); if (type != QSvgHandler::LT_PT) x = convertToPixels(x, true, type); + if (type == QSvgHandler::LT_PERCENT) { + x /= 100.; + rect->setUnitX(QtSvg::UnitTypes::objectBoundingBox); + } rect->setX(x); } else { rect->setX(-0.1); @@ -3159,6 +3163,10 @@ y = parseLength(yStr.toString(), &type, handler); if (type != QSvgHandler::LT_PT) y = convertToPixels(y, false, type); + if (type == QSvgHandler::LT_PERCENT) { + y /= 100.; + rect->setUnitX(QtSvg::UnitTypes::objectBoundingBox); + } rect->setY(y); } else { rect->setY(-0.1); @@ -3170,6 +3178,10 @@ width = parseLength(widthStr.toString(), &type, handler); if (type != QSvgHandler::LT_PT) width = convertToPixels(width, true, type); + if (type == QSvgHandler::LT_PERCENT) { + width /= 100.; + rect->setUnitX(QtSvg::UnitTypes::objectBoundingBox); + } rect->setWidth(width); } else { rect->setWidth(1.2); @@ -3181,6 +3193,10 @@ height = parseLength(heightStr.toString(), &type, handler); if (type != QSvgHandler::LT_PT) height = convertToPixels(height, false, type); + if (type == QSvgHandler::LT_PERCENT) { + height /= 100.; + rect->setUnitX(QtSvg::UnitTypes::objectBoundingBox); + } rect->setHeight(height); } else { rect->setHeight(1.2); @@ -4547,9 +4563,8 @@ } break; case QXmlStreamReader::EndElement: - endElement(xml->name()); + done = endElement(xml->name()); ++remainingUnfinishedElements; - done = (xml->name() == QLatin1String("svg")); break; case QXmlStreamReader::Characters: characters(xml->text()); @@ -4599,6 +4614,15 @@ if (!m_doc && localName != QLatin1String("svg")) return false; + if (m_doc && localName == QLatin1String("svg")) { + m_skipNodes.push(Doc); + qCWarning(lcSvgHandler) << "Skipping a nested svg element, because " + "SVG Document must not contain nested svg elements in Svg Tiny 1.2"; + } + + if (!m_skipNodes.isEmpty() && m_skipNodes.top() == Doc) + return true; + if (FactoryMethod method = findGroupFactory(localName, options())) { //group node = method(m_doc ? m_nodes.top() : 0, attributes, this); @@ -4757,14 +4781,17 @@ bool QSvgHandler::endElement(const QStringView localName) { CurrentNode node = m_skipNodes.top(); + + if (node == Doc && localName != QLatin1String("svg")) + return false; + m_skipNodes.pop(); m_whitespaceMode.pop(); popColor(); - if (node == Unknown) { - return true; - } + if (node == Unknown) + return false; #ifdef QT_NO_CSSPARSER Q_UNUSED(localName); @@ -4778,7 +4805,7 @@ else if (m_style && !m_skipNodes.isEmpty() && m_skipNodes.top() != Style) m_style = 0; - return true; + return ((localName == QLatin1String("svg")) && (node != Doc)); } void QSvgHandler::resolvePaintServers(QSvgNode *node, int nestedDepth) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/src/svg/qsvghandler_p.h new/qtsvg-everywhere-src-6.7.1/src/svg/qsvghandler_p.h --- old/qtsvg-everywhere-src-6.7.0/src/svg/qsvghandler_p.h 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/src/svg/qsvghandler_p.h 2024-05-08 20:41:42.000000000 +0200 @@ -121,7 +121,8 @@ { Unknown, Graphics, - Style + Style, + Doc }; QStack<CurrentNode> m_skipNodes; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/src/svg/qsvgnode.cpp new/qtsvg-everywhere-src-6.7.1/src/svg/qsvgnode.cpp --- old/qtsvg-everywhere-src-6.7.0/src/svg/qsvgnode.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/src/svg/qsvgnode.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -615,6 +615,10 @@ p->setBrush(Qt::black); p->setRenderHint(QPainter::Antialiasing); p->setRenderHint(QPainter::SmoothPixmapTransform); + QFont font(p->font()); + if (font.pointSize() < 0) + font.setPointSizeF(font.pixelSize() * 72.0 / p->device()->logicalDpiY()); + p->setFont(font); } bool QSvgNode::shouldDrawNode(QPainter *p, QSvgExtraStates &states) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/src/svg/qsvgrenderer.cpp new/qtsvg-everywhere-src-6.7.1/src/svg/qsvgrenderer.cpp --- old/qtsvg-everywhere-src-6.7.0/src/svg/qsvgrenderer.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/src/svg/qsvgrenderer.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -73,7 +73,9 @@ : QObjectPrivate(), render(0), timer(0), fps(30) - {} + { + options = defaultOptions(); + } ~QSvgRendererPrivate() { @@ -101,6 +103,14 @@ static void callRepaintNeeded(QSvgRenderer *const q); + static QtSvg::Options defaultOptions() + { + static bool envOk = false; + static QtSvg::Options envOpts = QtSvg::Options::fromInt( + qEnvironmentVariableIntValue("QT_SVG_DEFAULT_OPTIONS", &envOk)); + return envOk ? envOpts : QtSvg::Options{}; + } + QSvgTinyDocument *render; QTimer *timer; int fps; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/src/svg/qsvgstructure.cpp new/qtsvg-everywhere-src-6.7.1/src/svg/qsvgstructure.cpp --- old/qtsvg-everywhere-src-6.7.0/src/svg/qsvgstructure.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/src/svg/qsvgstructure.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -385,7 +385,12 @@ if (filterBoundsGlobRel.isEmpty()) return buffer; - QImage proxy = buffer.copy(filterBoundsGlobRel); + QImage proxy; + if (!QImageIOHandler::allocateImage(filterBoundsGlobRel.size(), buffer.format(), &proxy)) { + qCWarning(lcSvgDraw) << "The requested filter is too big, ignoring"; + return buffer; + } + proxy = buffer.copy(filterBoundsGlobRel); proxy.setOffset(filterBoundsGlob.topLeft()); if (proxy.isNull()) return buffer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/auto/qicon_svg/tst_qicon_svg.cpp new/qtsvg-everywhere-src-6.7.1/tests/auto/qicon_svg/tst_qicon_svg.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/auto/qicon_svg/tst_qicon_svg.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/auto/qicon_svg/tst_qicon_svg.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/auto/qsvgdevice/tst_qsvgdevice.cpp new/qtsvg-everywhere-src-6.7.1/tests/auto/qsvgdevice/tst_qsvgdevice.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/auto/qsvgdevice/tst_qsvgdevice.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/auto/qsvgdevice/tst_qsvgdevice.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/auto/qsvggenerator/tst_qsvggenerator.cpp new/qtsvg-everywhere-src-6.7.1/tests/auto/qsvggenerator/tst_qsvggenerator.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/auto/qsvggenerator/tst_qsvggenerator.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/auto/qsvggenerator/tst_qsvggenerator.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/auto/qsvgplugin/tst_qsvgplugin.cpp new/qtsvg-everywhere-src-6.7.1/tests/auto/qsvgplugin/tst_qsvgplugin.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/auto/qsvgplugin/tst_qsvgplugin.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/auto/qsvgplugin/tst_qsvgplugin.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp new/qtsvg-everywhere-src-6.7.1/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/baseline/qsvgrenderer/tst_baseline_qsvgrenderer.cpp new/qtsvg-everywhere-src-6.7.1/tests/baseline/qsvgrenderer/tst_baseline_qsvgrenderer.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/baseline/qsvgrenderer/tst_baseline_qsvgrenderer.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/baseline/qsvgrenderer/tst_baseline_qsvgrenderer.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <qbaselinetest.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp new/qtsvg-everywhere-src-6.7.1/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <qtest.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/libfuzzer/svg/qsvgrenderer/render/main.cpp new/qtsvg-everywhere-src-6.7.1/tests/libfuzzer/svg/qsvgrenderer/render/main.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/libfuzzer/svg/qsvgrenderer/render/main.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/libfuzzer/svg/qsvgrenderer/render/main.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> #include <QImage> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/cliptests/svgcliptest.cpp new/qtsvg-everywhere-src-6.7.1/tests/manual/cliptests/svgcliptest.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/manual/cliptests/svgcliptest.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/cliptests/svgcliptest.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, i...@kdab.com, author Giuseppe D'Angelo <giuseppe.dang...@kdab.com> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause if(TARGET Qt::Widgets) add_subdirectory(draganddrop) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/draganddrop/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/draganddrop/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/draganddrop/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/draganddrop/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause if(TARGET Qt::Widgets) add_subdirectory(delayedencoding) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/draganddrop/delayedencoding/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/draganddrop/delayedencoding/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/draganddrop/delayedencoding/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/draganddrop/delayedencoding/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(delayedencoding LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/embedded/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/embedded/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/embedded/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/embedded/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause if(TARGET Qt::Widgets) add_subdirectory(desktopservices) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/embedded/desktopservices/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/embedded/desktopservices/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/embedded/desktopservices/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/embedded/desktopservices/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(desktopservices LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/embedded/fluidlauncher/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/embedded/fluidlauncher/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/embedded/fluidlauncher/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/embedded/fluidlauncher/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(fluidlauncher LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/embeddedsvgviewer/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/embeddedsvgviewer/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/embeddedsvgviewer/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/embeddedsvgviewer/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(embeddedsvgviewer LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/svggenerator/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/svggenerator/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/svggenerator/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/svggenerator/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(svggenerator LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/svgviewer/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/svgviewer/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/svgviewer/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/svgviewer/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(svgviewer LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/textobject/CMakeLists.txt new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/textobject/CMakeLists.txt --- old/qtsvg-everywhere-src-6.7.0/tests/manual/examples/textobject/CMakeLists.txt 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/examples/textobject/CMakeLists.txt 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(textobject LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.7.0/tests/manual/rendertestsuite/main.cpp new/qtsvg-everywhere-src-6.7.1/tests/manual/rendertestsuite/main.cpp --- old/qtsvg-everywhere-src-6.7.0/tests/manual/rendertestsuite/main.cpp 2024-03-22 12:24:07.000000000 +0100 +++ new/qtsvg-everywhere-src-6.7.1/tests/manual/rendertestsuite/main.cpp 2024-05-08 20:41:42.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore> #include <QtSvg>