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 2023-04-05 21:32:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-svg (Old)
 and      /work/SRC/openSUSE:Factory/.qt6-svg.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qt6-svg"

Wed Apr  5 21:32:11 2023 rev:21 rq:1077346 version:6.5.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-svg/qt6-svg.changes  2023-03-17 
17:04:11.285657032 +0100
+++ /work/SRC/openSUSE:Factory/.qt6-svg.new.19717/qt6-svg.changes       
2023-04-05 21:37:07.667072802 +0200
@@ -1,0 +2,6 @@
+Mon Apr  3 10:02:45 UTC 2023 - Christophe Marin <christo...@krop.fr>
+
+- Update to 6.5.0
+  * https://www.qt.io/blog/qt-6.5-lts-released
+
+-------------------------------------------------------------------

Old:
----
  qtsvg-everywhere-src-6.4.3.tar.xz

New:
----
  qtsvg-everywhere-src-6.5.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qt6-svg.spec ++++++
--- /var/tmp/diff_new_pack.lAG94i/_old  2023-04-05 21:37:08.635078328 +0200
+++ /var/tmp/diff_new_pack.lAG94i/_new  2023-04-05 21:37:08.651078418 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package qt6-svg
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
 #
 
 
-%define real_version 6.4.3
-%define short_version 6.4
+%define real_version 6.5.0
+%define short_version 6.5
 %define tar_name qtsvg-everywhere-src
 %define tar_suffix %{nil}
 #
@@ -27,7 +27,7 @@
 %endif
 #
 Name:           qt6-svg%{?pkg_suffix}
-Version:        6.4.3
+Version:        6.5.0
 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)
@@ -38,9 +38,9 @@
 BuildRequires:  qt6-core-private-devel
 BuildRequires:  qt6-gui-private-devel
 BuildRequires:  qt6-widgets-private-devel
-BuildRequires:  cmake(Qt6Core)
-BuildRequires:  cmake(Qt6Gui)
-BuildRequires:  cmake(Qt6Widgets)
+BuildRequires:  cmake(Qt6Core) = %{real_version}
+BuildRequires:  cmake(Qt6Gui) = %{real_version}
+BuildRequires:  cmake(Qt6Widgets) = %{real_version}
 BuildRequires:  pkgconfig(zlib)
 # Ignored: only used for building tests
 # BuildRequires:  cmake(Qt6Xml)
@@ -67,13 +67,12 @@
 %description -n libQt6SvgWidgets6
 The Qt 6 SvgWidgets library.
 
-# TODO split?
 %package devel
 Summary:        Qt 6 SVG libraries - Development files
 Requires:       libQt6Svg6 = %{version}
 Requires:       libQt6SvgWidgets6 = %{version}
-Requires:       cmake(Qt6Gui)
-Requires:       cmake(Qt6Widgets)
+Requires:       cmake(Qt6Gui) = %{real_version}
+Requires:       cmake(Qt6Widgets) = %{real_version}
 
 %description devel
 Development files for the Qt 6 SVG libraries.

++++++ qtsvg-everywhere-src-6.4.3.tar.xz -> qtsvg-everywhere-src-6.5.0.tar.xz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/.cmake.conf 
new/qtsvg-everywhere-src-6.5.0/.cmake.conf
--- old/qtsvg-everywhere-src-6.4.3/.cmake.conf  2023-03-11 19:16:56.000000000 
+0100
+++ new/qtsvg-everywhere-src-6.5.0/.cmake.conf  2023-03-25 20:28:30.000000000 
+0100
@@ -1,2 +1,3 @@
-set(QT_REPO_MODULE_VERSION "6.4.3")
+set(QT_REPO_MODULE_VERSION "6.5.0")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
+set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/.tag 
new/qtsvg-everywhere-src-6.5.0/.tag
--- old/qtsvg-everywhere-src-6.4.3/.tag 2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/.tag 2023-03-25 20:28:30.000000000 +0100
@@ -1 +1 @@
-793dde464486e900a793eabf7138d2b3c2159749
+276e202014c9f57dcd0129dd25df38fddf9f4d25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/CMakeLists.txt       2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/CMakeLists.txt       2023-03-25 
20:28:30.000000000 +0100
@@ -1,17 +1,18 @@
-# Generated from qtsvg.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 cmake_minimum_required(VERSION 3.16)
 
 include(.cmake.conf)
 project(QtSvg
     VERSION "${QT_REPO_MODULE_VERSION}"
-    DESCRIPTION "Qt SVG Libraries" # special case
+    DESCRIPTION "Qt SVG Libraries"
     HOMEPAGE_URL "https://qt.io/";
     LANGUAGES CXX C
 )
 
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals 
Core) # special case
-find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui 
Widgets Xml) # special case
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals 
Core)
+find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui 
Widgets Xml)
 
 # Needed for examples to configure properly when not using ExternalProject and 
when
 # Qt is configured with a bundled zlib.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/coin/module_config.yaml 
new/qtsvg-everywhere-src-6.5.0/coin/module_config.yaml
--- old/qtsvg-everywhere-src-6.4.3/coin/module_config.yaml      2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/coin/module_config.yaml      2023-03-25 
20:28:30.000000000 +0100
@@ -10,3 +10,4 @@
 
   Test:
     - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml"
+    - !include "{{qt/qtbase}}/coin_module_test_docs.yaml"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/dependencies.yaml 
new/qtsvg-everywhere-src-6.5.0/dependencies.yaml
--- old/qtsvg-everywhere-src-6.4.3/dependencies.yaml    2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/dependencies.yaml    2023-03-25 
20:28:30.000000000 +0100
@@ -1,4 +1,4 @@
 dependencies:
   ../qtbase:
-    ref: 519d2d8f442409e86a0ee2fa16bd543342180861
+    ref: aea92807be2567c4212b96ae67de7137075ba4ee
     required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/examples/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/examples/CMakeLists.txt      2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/examples/CMakeLists.txt      2023-03-25 
20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 qt_examples_build_begin(EXTERNAL_BUILD)
 
 add_subdirectory(svg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/examples/svg/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/svg/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/examples/svg/CMakeLists.txt  2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/examples/svg/CMakeLists.txt  2023-03-25 
20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 add_subdirectory(embedded)
 add_subdirectory(richtext)
 add_subdirectory(draganddrop)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/examples/svg/draganddrop/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/svg/draganddrop/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/examples/svg/draganddrop/CMakeLists.txt      
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/examples/svg/draganddrop/CMakeLists.txt      
2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 if(TARGET Qt::Widgets)
     qt_internal_add_example(delayedencoding)
 endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/examples/svg/draganddrop/delayedencoding/CMakeLists.txt
 
new/qtsvg-everywhere-src-6.5.0/examples/svg/draganddrop/delayedencoding/CMakeLists.txt
--- 
old/qtsvg-everywhere-src-6.4.3/examples/svg/draganddrop/delayedencoding/CMakeLists.txt
      2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/examples/svg/draganddrop/delayedencoding/CMakeLists.txt
      2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: 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.4.3/examples/svg/embedded/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/svg/embedded/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/examples/svg/embedded/CMakeLists.txt 
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/examples/svg/embedded/CMakeLists.txt 
2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 if(TARGET Qt::Widgets)
     qt_internal_add_example(desktopservices)
 endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/examples/svg/embedded/desktopservices/CMakeLists.txt
 
new/qtsvg-everywhere-src-6.5.0/examples/svg/embedded/desktopservices/CMakeLists.txt
--- 
old/qtsvg-everywhere-src-6.4.3/examples/svg/embedded/desktopservices/CMakeLists.txt
 2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/examples/svg/embedded/desktopservices/CMakeLists.txt
 2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: 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.4.3/examples/svg/embedded/fluidlauncher/CMakeLists.txt
 
new/qtsvg-everywhere-src-6.5.0/examples/svg/embedded/fluidlauncher/CMakeLists.txt
--- 
old/qtsvg-everywhere-src-6.4.3/examples/svg/embedded/fluidlauncher/CMakeLists.txt
   2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/examples/svg/embedded/fluidlauncher/CMakeLists.txt
   2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: 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.4.3/examples/svg/embedded/weatherinfo/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/svg/embedded/weatherinfo/CMakeLists.txt
--- 
old/qtsvg-everywhere-src-6.4.3/examples/svg/embedded/weatherinfo/CMakeLists.txt 
    2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/examples/svg/embedded/weatherinfo/CMakeLists.txt 
    2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.16)
 project(svgweatherinfo LANGUAGES CXX)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/examples/svg/embeddedsvgviewer/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/svg/embeddedsvgviewer/CMakeLists.txt
--- 
old/qtsvg-everywhere-src-6.4.3/examples/svg/embeddedsvgviewer/CMakeLists.txt    
    2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/examples/svg/embeddedsvgviewer/CMakeLists.txt    
    2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: 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.4.3/examples/svg/richtext/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/svg/richtext/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/examples/svg/richtext/CMakeLists.txt 
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/examples/svg/richtext/CMakeLists.txt 
2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 if(TARGET Qt::Widgets)
     qt_internal_add_example(textobject)
 endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/examples/svg/richtext/textobject/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/svg/richtext/textobject/CMakeLists.txt
--- 
old/qtsvg-everywhere-src-6.4.3/examples/svg/richtext/textobject/CMakeLists.txt  
    2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/examples/svg/richtext/textobject/CMakeLists.txt  
    2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: 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.4.3/examples/svg/svggenerator/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/svg/svggenerator/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/examples/svg/svggenerator/CMakeLists.txt     
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/examples/svg/svggenerator/CMakeLists.txt     
2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: 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.4.3/examples/svg/svgviewer/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/examples/svg/svgviewer/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/examples/svg/svgviewer/CMakeLists.txt        
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/examples/svg/svgviewer/CMakeLists.txt        
2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: 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.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgfont_p.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgfont_p.h
--- 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgfont_p.h   
    2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgfont_p.h   
    1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgfont_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvggraphics_p.h
 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvggraphics_p.h
--- 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvggraphics_p.h
   2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvggraphics_p.h
   1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvggraphics_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvghandler_p.h
 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvghandler_p.h
--- 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvghandler_p.h
    2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvghandler_p.h
    1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvghandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgnode_p.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgnode_p.h
--- 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgnode_p.h   
    2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgnode_p.h   
    1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgnode_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgstructure_p.h
 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgstructure_p.h
--- 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgstructure_p.h
  2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgstructure_p.h
  1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgstructure_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgstyle_p.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgstyle_p.h
--- 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgstyle_p.h  
    2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgstyle_p.h  
    1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgstyle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgtinydocument_p.h
 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgtinydocument_p.h
--- 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qsvgtinydocument_p.h
       2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qsvgtinydocument_p.h
       1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgtinydocument_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qtsvgglobal_p.h
 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qtsvgglobal_p.h
--- 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/6.4.3/QtSvg/private/qtsvgglobal_p.h
    2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/6.4.3/QtSvg/private/qtsvgglobal_p.h
    1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qtsvgglobal_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/QSvgGenerator 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/QSvgGenerator
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvg/QSvgGenerator  2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvg/QSvgGenerator  1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsvggenerator.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/QSvgRenderer 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/QSvgRenderer
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvg/QSvgRenderer   2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvg/QSvgRenderer   1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsvgrenderer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/include/QtSvg/QtSvg 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/QtSvg
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvg/QtSvg  2023-03-12 
11:00:39.322240800 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvg/QtSvg  1970-01-01 
01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#ifndef QT_QTSVG_MODULE_H
-#define QT_QTSVG_MODULE_H
-#include <QtSvg/QtSvgDepends>
-#include "qtsvgglobal.h"
-#include "qsvggenerator.h"
-#include "qsvgrenderer.h"
-#include "qtsvgversion.h"
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/QtSvgVersion 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/QtSvgVersion
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvg/QtSvgVersion   2023-03-12 
11:00:39.322240800 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvg/QtSvgVersion   1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtsvgversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/include/QtSvg/headers.pri 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/headers.pri
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvg/headers.pri    2023-03-12 
11:00:39.322240800 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvg/headers.pri    1970-01-01 
01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-SYNCQT.HEADER_FILES = qsvggenerator.h qsvgrenderer.h qtsvgglobal.h 
-SYNCQT.GENERATED_HEADER_FILES = QSvgGenerator QSvgRenderer qtsvgversion.h 
QtSvgVersion QtSvg 
-SYNCQT.PRIVATE_HEADER_FILES = qsvgfont_p.h qsvggraphics_p.h qsvghandler_p.h 
qsvgnode_p.h qsvgstructure_p.h qsvgstyle_p.h qsvgtinydocument_p.h 
qtsvgglobal_p.h 
-SYNCQT.QPA_HEADER_FILES = 
-SYNCQT.CLEAN_HEADER_FILES = qsvggenerator.h qsvgrenderer.h qtsvgglobal.h 
-SYNCQT.INJECTIONS = 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/qsvggenerator.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/qsvggenerator.h
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvg/qsvggenerator.h        
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvg/qsvggenerator.h        
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svg/qsvggenerator.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/qsvgrenderer.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/qsvgrenderer.h
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvg/qsvgrenderer.h 2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvg/qsvgrenderer.h 1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svg/qsvgrenderer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/qtsvgglobal.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/qtsvgglobal.h
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvg/qtsvgglobal.h  2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvg/qtsvgglobal.h  1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svg/qtsvgglobal.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvg/qtsvgversion.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvg/qtsvgversion.h
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvg/qtsvgversion.h 2023-03-12 
11:00:39.322240800 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvg/qtsvgversion.h 1970-01-01 
01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-/* This file was generated by syncqt. */
-#ifndef QT_QTSVG_VERSION_H
-#define QT_QTSVG_VERSION_H
-
-#define QTSVG_VERSION_STR "6.4.3"
-
-#define QTSVG_VERSION 0x060403
-
-#endif // QT_QTSVG_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/QGraphicsSvgItem 
new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/QGraphicsSvgItem
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/QGraphicsSvgItem        
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/QGraphicsSvgItem        
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qgraphicssvgitem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/QSvgWidget 
new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/QSvgWidget
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/QSvgWidget      
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/QSvgWidget      
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsvgwidget.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/QtSvgWidgets 
new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/QtSvgWidgets
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/QtSvgWidgets    
2023-03-12 11:00:39.310240700 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/QtSvgWidgets    
1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#ifndef QT_QTSVGWIDGETS_MODULE_H
-#define QT_QTSVGWIDGETS_MODULE_H
-#include <QtSvgWidgets/QtSvgWidgetsDepends>
-#include "qtsvgwidgetsglobal.h"
-#include "qgraphicssvgitem.h"
-#include "qsvgwidget.h"
-#include "qtsvgwidgetsversion.h"
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/QtSvgWidgetsVersion 
new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/QtSvgWidgetsVersion
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/QtSvgWidgetsVersion     
2023-03-12 11:00:39.310240700 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/QtSvgWidgetsVersion     
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtsvgwidgetsversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/headers.pri 
new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/headers.pri
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/headers.pri     
2023-03-12 11:00:39.310240700 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/headers.pri     
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-SYNCQT.HEADER_FILES = qgraphicssvgitem.h qsvgwidget.h qtsvgwidgetsglobal.h 
-SYNCQT.GENERATED_HEADER_FILES = QGraphicsSvgItem QSvgWidget 
qtsvgwidgetsversion.h QtSvgWidgetsVersion QtSvgWidgets 
-SYNCQT.PRIVATE_HEADER_FILES = 
-SYNCQT.QPA_HEADER_FILES = 
-SYNCQT.CLEAN_HEADER_FILES = qgraphicssvgitem.h qsvgwidget.h 
qtsvgwidgetsglobal.h 
-SYNCQT.INJECTIONS = 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/qgraphicssvgitem.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/qgraphicssvgitem.h
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/qgraphicssvgitem.h      
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/qgraphicssvgitem.h      
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svgwidgets/qgraphicssvgitem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/qsvgwidget.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/qsvgwidget.h
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/qsvgwidget.h    
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/qsvgwidget.h    
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svgwidgets/qsvgwidget.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/qtsvgwidgetsglobal.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/qtsvgwidgetsglobal.h
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/qtsvgwidgetsglobal.h    
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/qtsvgwidgetsglobal.h    
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svgwidgets/qtsvgwidgetsglobal.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/qtsvgwidgetsversion.h 
new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/qtsvgwidgetsversion.h
--- old/qtsvg-everywhere-src-6.4.3/include/QtSvgWidgets/qtsvgwidgetsversion.h   
2023-03-12 11:00:39.310240700 +0100
+++ new/qtsvg-everywhere-src-6.5.0/include/QtSvgWidgets/qtsvgwidgetsversion.h   
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-/* This file was generated by syncqt. */
-#ifndef QT_QTSVGWIDGETS_VERSION_H
-#define QT_QTSVGWIDGETS_VERSION_H
-
-#define QTSVGWIDGETS_VERSION_STR "6.4.3"
-
-#define QTSVGWIDGETS_VERSION 0x060403
-
-#endif // QT_QTSVGWIDGETS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/src/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/src/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/src/CMakeLists.txt   2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/CMakeLists.txt   2023-03-25 
20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from src.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 if(TARGET Qt::Gui)
     add_subdirectory(svg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/src/plugins/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/src/plugins/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/src/plugins/CMakeLists.txt   2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/plugins/CMakeLists.txt   2023-03-25 
20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from plugins.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 add_subdirectory(iconengines)
 if(QT_FEATURE_imageformatplugin)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/src/plugins/iconengines/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/src/plugins/iconengines/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/src/plugins/iconengines/CMakeLists.txt       
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/plugins/iconengines/CMakeLists.txt       
2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,4 @@
-# Generated from iconengines.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 add_subdirectory(svgiconengine)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/src/plugins/iconengines/svgiconengine/CMakeLists.txt
 
new/qtsvg-everywhere-src-6.5.0/src/plugins/iconengines/svgiconengine/CMakeLists.txt
--- 
old/qtsvg-everywhere-src-6.4.3/src/plugins/iconengines/svgiconengine/CMakeLists.txt
 2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/src/plugins/iconengines/svgiconengine/CMakeLists.txt
 2023-03-25 20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from svgiconengine.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## QSvgIconPlugin Plugin:
@@ -17,7 +18,3 @@
         Qt::GuiPrivate
         Qt::Svg
 )
-
-#### Keys ignored in scope 1:.:.:svgiconengine.pro:<TRUE>:
-# OTHER_FILES = "qsvgiconengine.json" "qsvgiconengine-nocompress.json"
-# PLUGIN_EXTENDS = "svg"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/src/plugins/imageformats/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/src/plugins/imageformats/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/src/plugins/imageformats/CMakeLists.txt      
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/plugins/imageformats/CMakeLists.txt      
2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,4 @@
-# Generated from imageformats.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 add_subdirectory(svg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/src/plugins/imageformats/svg/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/src/plugins/imageformats/svg/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/src/plugins/imageformats/svg/CMakeLists.txt  
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/plugins/imageformats/svg/CMakeLists.txt  
2023-03-25 20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from svg.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## QSvgPlugin Plugin:
@@ -15,6 +16,3 @@
         Qt::Gui
         Qt::Svg
 )
-
-#### Keys ignored in scope 1:.:.:svg.pro:<TRUE>:
-# PLUGIN_EXTENDS = "svg"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/src/svg/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/src/svg/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/src/svg/CMakeLists.txt       2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/svg/CMakeLists.txt       2023-03-25 
20:28:30.000000000 +0100
@@ -1,17 +1,16 @@
-# Generated from svg.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## Svg Module:
 #####################################################################
 
-# special case begin
 # Handle the conditional finding of either system zlib or qt zlib.
 if(NOT QT_FEATURE_system_zlib)
     find_package(Qt6 COMPONENTS ZlibPrivate)
 elseif(NOT TARGET WrapZLIB::WrapZLIB)
     qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
 endif()
-# special case end
 
 qt_internal_add_module(Svg
     SOURCES
@@ -48,9 +47,6 @@
         "/BASE:0x66000000"
 )
 
-#### Keys ignored in scope 4:.:.:svg.pro:solaris-cc_x_:
-# QMAKE_CXXFLAGS_RELEASE = "--O2"
-
 qt_internal_extend_target(Svg CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         WrapZLIB::WrapZLIB
@@ -63,4 +59,3 @@
 qt_internal_add_docs(Svg
     doc/qtsvg.qdocconf
 )
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/src/svg/doc/qtsvg.qdocconf 
new/qtsvg-everywhere-src-6.5.0/src/svg/doc/qtsvg.qdocconf
--- old/qtsvg-everywhere-src-6.4.3/src/svg/doc/qtsvg.qdocconf   2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/svg/doc/qtsvg.qdocconf   2023-03-25 
20:28:30.000000000 +0100
@@ -48,3 +48,6 @@
 
 navigation.landingpage = "Qt SVG"
 navigation.cppclassespage = "Qt SVG C++ Classes"
+
+# Fail the documentation build if there are more warnings than the limit
+warninglimit = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/src/svg/qsvggenerator.cpp 
new/qtsvg-everywhere-src-6.5.0/src/svg/qsvggenerator.cpp
--- old/qtsvg-everywhere-src-6.4.3/src/svg/qsvggenerator.cpp    2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/svg/qsvggenerator.cpp    2023-03-25 
20:28:30.000000000 +0100
@@ -20,6 +20,8 @@
 
 #include "qdebug.h"
 
+#include <optional>
+
 QT_BEGIN_NAMESPACE
 
 static void translate_color(const QColor &color, QString *color_string,
@@ -50,7 +52,8 @@
 class QSvgPaintEnginePrivate : public QPaintEnginePrivate
 {
 public:
-    QSvgPaintEnginePrivate()
+    explicit QSvgPaintEnginePrivate(QSvgGenerator::SvgVersion version)
+        : svgVersion(version)
     {
         size = QSize();
         viewBox = QRectF();
@@ -68,6 +71,7 @@
         numGradients = 0;
     }
 
+    QSvgGenerator::SvgVersion svgVersion;
     QSize size;
     QRectF viewBox;
     QIODevice *outputDevice;
@@ -107,6 +111,21 @@
         QString dashPattern, dashOffset;
         QString fill, fillOpacity;
     } attributes;
+
+    QString generateClipPathName() {
+        ++numClipPaths;
+        currentClipPathName = QStringLiteral("clipPath%1").arg(numClipPaths);
+        return currentClipPathName;
+    }
+
+    std::optional<QPainterPath> clipPath;
+    bool clipEnabled = false;
+    bool isClippingEffective() const {
+        return clipEnabled && clipPath.has_value();
+    }
+    QString currentClipPathName;
+    int numClipPaths = 0;
+    bool hasEmittedClipGroup = false;
 };
 
 static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures()
@@ -125,8 +144,8 @@
     Q_DECLARE_PRIVATE(QSvgPaintEngine)
 public:
 
-    QSvgPaintEngine()
-        : QPaintEngine(*new QSvgPaintEnginePrivate,
+    explicit QSvgPaintEngine(QSvgGenerator::SvgVersion version)
+        : QPaintEngine(*new QSvgPaintEnginePrivate(version),
                        svgEngineFeatures())
     {
     }
@@ -135,6 +154,7 @@
     bool end() override;
 
     void updateState(const QPaintEngineState &state) override;
+    void updateClipState(const QPaintEngineState &state);
     void popGroup();
 
     void drawEllipse(const QRectF &r) override;
@@ -176,12 +196,14 @@
         d_func()->outputDevice = device;
     }
 
-    int resolution() { return d_func()->resolution; }
+    int resolution() const { return d_func()->resolution; }
     void setResolution(int resolution) {
         Q_ASSERT(!isActive());
         d_func()->resolution = resolution;
     }
 
+    QSvgGenerator::SvgVersion svgVersion() const { return 
d_func()->svgVersion; }
+
     QString savePatternMask(Qt::BrushStyle style)
     {
         QString maskId = QString(QStringLiteral("patternmask%1")).arg(style);
@@ -545,14 +567,37 @@
 */
 
 /*!
-    Constructs a new generator.
+    \enum QSvgGenerator::SvgVersion
+    \since 6.5
+
+    This enumeration describes the version of the SVG output of the
+    generator.
+
+    \value SvgTiny12 The generated document follows the SVG Tiny 1.2 
specification.
+    \value Svg11 The generated document follows the SVG 1.1 specification.
+*/
+
+#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+/*!
+    Constructs a new generator using the SVG Tiny 1.2 profile.
 */
 QSvgGenerator::QSvgGenerator()
+    : QSvgGenerator(SvgVersion::SvgTiny12)
+{
+}
+#endif
+
+/*!
+    \since 6.5
+
+    Constructs a new generator that uses the SVG version \a version.
+*/
+QSvgGenerator::QSvgGenerator(SvgVersion version)
     : d_ptr(new QSvgGeneratorPrivate)
 {
     Q_D(QSvgGenerator);
 
-    d->engine = new QSvgPaintEngine;
+    d->engine = new QSvgPaintEngine(version);
     d->owns_iodevice = false;
 }
 
@@ -767,6 +812,18 @@
 }
 
 /*!
+    \since 6.5
+
+    Returns the version of the SVG document that this generator is
+    producing.
+*/
+QSvgGenerator::SvgVersion QSvgGenerator::svgVersion() const
+{
+    Q_D(const QSvgGenerator);
+    return d->engine->svgVersion();
+}
+
+/*!
     Returns the paint engine used to render graphics to be converted to SVG
     format information.
 */
@@ -855,15 +912,23 @@
     }
 
     *d->stream << " xmlns=\"http://www.w3.org/2000/svg\"";
-                  " xmlns:xlink=\"http://www.w3.org/1999/xlink\"; "
-                  " version=\"1.2\" baseProfile=\"tiny\">" << Qt::endl;
+                  " xmlns:xlink=\"http://www.w3.org/1999/xlink\"";;
+    switch (d->svgVersion) {
+    case QSvgGenerator::SvgVersion::SvgTiny12:
+        *d->stream << " version=\"1.2\" baseProfile=\"tiny\">";
+        break;
+    case QSvgGenerator::SvgVersion::Svg11:
+        *d->stream << " version=\"1.1\">";
+        break;
+    }
+    *d->stream << Qt::endl;
 
     if (!d->attributes.document_title.isEmpty()) {
-        *d->stream << "<title>" << d->attributes.document_title << "</title>" 
<< Qt::endl;
+        *d->stream << "<title>" << 
d->attributes.document_title.toHtmlEscaped() << "</title>" << Qt::endl;
     }
 
     if (!d->attributes.document_description.isEmpty()) {
-        *d->stream << "<desc>" << d->attributes.document_description << 
"</desc>" << Qt::endl;
+        *d->stream << "<desc>" << 
d->attributes.document_description.toHtmlEscaped() << "</desc>" << Qt::endl;
     }
 
     d->stream->setString(&d->defs);
@@ -890,6 +955,8 @@
     *d->stream << d->header;
     *d->stream << d->defs;
     *d->stream << d->body;
+    if (d->hasEmittedClipGroup)
+        *d->stream << "</g>";
     if (d->afterFirstUpdate)
         *d->stream << "</g>" << Qt::endl; // close the updateState
 
@@ -942,49 +1009,85 @@
 void QSvgPaintEngine::updateState(const QPaintEngineState &state)
 {
     Q_D(QSvgPaintEngine);
-    QPaintEngine::DirtyFlags flags = state.state();
-
     // always stream full gstate, which is not required, but...
-    flags |= QPaintEngine::AllDirty;
 
     // close old state and start a new one...
+    if (d->hasEmittedClipGroup)
+        *d->stream << "</g>\n";
     if (d->afterFirstUpdate)
         *d->stream << "</g>\n\n";
 
-    *d->stream << "<g ";
+    updateClipState(state);
 
-    if (flags & QPaintEngine::DirtyBrush) {
-        qbrushToSvg(state.brush());
+    if (d->isClippingEffective()) {
+        *d->stream << QStringLiteral("<g 
clip-path=\"url(#%1)\">").arg(d->currentClipPathName);
+        d->hasEmittedClipGroup = true;
+    } else {
+        d->hasEmittedClipGroup = false;
     }
 
-    if (flags & QPaintEngine::DirtyPen) {
-        qpenToSvg(state.pen());
-    }
+    *d->stream << "<g ";
 
-    if (flags & QPaintEngine::DirtyTransform) {
-        d->matrix = state.transform();
-        *d->stream << "transform=\"matrix(" << d->matrix.m11() << ','
-                   << d->matrix.m12() << ','
-                   << d->matrix.m21() << ',' << d->matrix.m22() << ','
-                   << d->matrix.dx() << ',' << d->matrix.dy()
-                   << ")\""
-                   << Qt::endl;
-    }
+    qbrushToSvg(state.brush());
+    qpenToSvg(state.pen());
 
-    if (flags & QPaintEngine::DirtyFont) {
-        qfontToSvg(state.font());
-    }
+    d->matrix = state.transform();
+    *d->stream << "transform=\"matrix(" << d->matrix.m11() << ','
+               << d->matrix.m12() << ','
+               << d->matrix.m21() << ',' << d->matrix.m22() << ','
+               << d->matrix.dx() << ',' << d->matrix.dy()
+               << ")\""
+               << Qt::endl;
 
-    if (flags & QPaintEngine::DirtyOpacity) {
-        if (!qFuzzyIsNull(state.opacity() - 1))
-            stream() << "opacity=\""<<state.opacity()<<"\" ";
-    }
+    qfontToSvg(state.font());
+
+    if (!qFuzzyIsNull(state.opacity() - 1))
+        stream() << "opacity=\""<<state.opacity()<<"\" ";
 
     *d->stream << '>' << Qt::endl;
 
     d->afterFirstUpdate = true;
 }
 
+void QSvgPaintEngine::updateClipState(const QPaintEngineState &state)
+{
+    Q_D(QSvgPaintEngine);
+    switch (d->svgVersion) {
+    case QSvgGenerator::SvgVersion::SvgTiny12:
+        // no clip handling in Tiny 1.2
+        return;
+    case QSvgGenerator::SvgVersion::Svg11:
+        break;
+    }
+
+    const QPaintEngine::DirtyFlags flags = state.state();
+
+    const bool clippingChanged = flags.testAnyFlags(DirtyClipPath | 
DirtyClipRegion);
+    if (clippingChanged) {
+        switch (state.clipOperation()) {
+        case Qt::NoClip:
+            d->clipEnabled = false;
+            d->clipPath.reset();
+            break;
+        case Qt::ReplaceClip:
+        case Qt::IntersectClip:
+            d->clipPath = painter()->transform().map(painter()->clipPath());
+            break;
+        }
+    }
+
+    if (flags & DirtyClipEnabled)
+        d->clipEnabled = state.isClipEnabled();
+
+    if (d->isClippingEffective() && clippingChanged) {
+        d->stream->setString(&d->defs);
+        *d->stream << QLatin1String("<clipPath 
id=\"%1\">\n").arg(d->generateClipPathName());
+        drawPath(*d->clipPath);
+        *d->stream << "</clipPath>\n";
+        d->stream->setString(&d->body);
+    }
+}
+
 void QSvgPaintEngine::drawEllipse(const QRectF &r)
 {
     Q_D(QSvgPaintEngine);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/src/svg/qsvggenerator.h 
new/qtsvg-everywhere-src-6.5.0/src/svg/qsvggenerator.h
--- old/qtsvg-everywhere-src-6.4.3/src/svg/qsvggenerator.h      2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/svg/qsvggenerator.h      2023-03-25 
20:28:30.000000000 +0100
@@ -23,6 +23,7 @@
 {
     Q_DECLARE_PRIVATE(QSvgGenerator)
 
+    // Not a QObject; just a hack to get documentation from qdoc
     Q_PROPERTY(QSize size READ size WRITE setSize)
     Q_PROPERTY(QRectF viewBox READ viewBoxF WRITE setViewBox)
     Q_PROPERTY(QString title READ title WRITE setTitle)
@@ -31,7 +32,18 @@
     Q_PROPERTY(QIODevice* outputDevice READ outputDevice WRITE setOutputDevice)
     Q_PROPERTY(int resolution READ resolution WRITE setResolution)
 public:
+    enum class SvgVersion {
+        SvgTiny12,
+        Svg11,
+    };
+
+    // ### Qt 7: unify overloads
+#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
     QSvgGenerator();
+    explicit QSvgGenerator(SvgVersion version);
+#else
+    explicit QSvgGenerator(SvgVersion version = SvgVersion::SvgTiny12);
+#endif
     ~QSvgGenerator();
 
     QString title() const;
@@ -56,6 +68,8 @@
 
     void setResolution(int dpi);
     int resolution() const;
+
+    SvgVersion svgVersion() const;
 protected:
     QPaintEngine *paintEngine() const override;
     int metric(QPaintDevice::PaintDeviceMetric metric) const override;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/src/svgwidgets/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/src/svgwidgets/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/src/svgwidgets/CMakeLists.txt        
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/src/svgwidgets/CMakeLists.txt        
2023-03-25 20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from svgwidgets.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## SvgWidgets Module:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/tests/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/CMakeLists.txt 2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/CMakeLists.txt 2023-03-25 
20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from tests.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 if(QT_BUILD_STANDALONE_TESTS)
     # Add qt_find_package calls for extra dependencies that need to be found 
when building
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.3/tests/auto/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/auto/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/auto/CMakeLists.txt    2023-03-11 
19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/auto/CMakeLists.txt    2023-03-25 
20:28:30.000000000 +0100
@@ -1,3 +1,5 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 # For now, don't built auto tests when QT_BUILD_MINIMAL_STATIC_TEST
 # is specified and the build is targeting iOS. QT_BUILD_MINIMAL_STATIC_TEST is 
used in our CI.
@@ -9,9 +11,9 @@
 
 if(TARGET Qt::Widgets)
     add_subdirectory(qsvgdevice)
-    if(TARGET Qt::Xml) # special case
-        add_subdirectory(qsvggenerator) # special case
-    endif() # special case
+    if(TARGET Qt::Xml)
+        add_subdirectory(qsvggenerator)
+    endif()
     add_subdirectory(qsvgplugin)
     add_subdirectory(qicon_svg)
     # add_subdirectory(cmake) # special case remove
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/auto/cmake/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/auto/cmake/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/auto/cmake/CMakeLists.txt      
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/auto/cmake/CMakeLists.txt      
2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 
 cmake_minimum_required(VERSION 3.16)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/auto/qicon_svg/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/auto/qicon_svg/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/auto/qicon_svg/CMakeLists.txt  
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/auto/qicon_svg/CMakeLists.txt  
2023-03-25 20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from qicon_svg.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qicon_svg Test:
@@ -11,10 +12,10 @@
 list(APPEND test_data ${test_data_glob})
 
 qt_internal_add_test(tst_qicon_svg
-    LOWDPI # special case
+    LOWDPI
     SOURCES
         tst_qicon_svg.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
         Qt::GuiPrivate
         Qt::Svg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvgdevice/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvgdevice/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvgdevice/CMakeLists.txt 
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvgdevice/CMakeLists.txt 
2023-03-25 20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from qsvgdevice.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qsvgdevice Test:
@@ -7,7 +8,7 @@
 qt_internal_add_test(tst_qsvgdevice
     SOURCES
         tst_qsvgdevice.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
         Qt::GuiPrivate
         Qt::Widgets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvggenerator/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvggenerator/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvggenerator/CMakeLists.txt      
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvggenerator/CMakeLists.txt      
2023-03-25 20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from qsvggenerator.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qsvggenerator Test:
@@ -7,7 +8,7 @@
 qt_internal_add_test(tst_qsvggenerator
     SOURCES
         tst_qsvggenerator.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
         Qt::GuiPrivate
         Qt::Svg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvggenerator/tst_qsvggenerator.cpp 
new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
--- 
old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvggenerator/tst_qsvggenerator.cpp   
    2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvggenerator/tst_qsvggenerator.cpp   
    2023-03-25 20:28:30.000000000 +0100
@@ -25,6 +25,8 @@
 private slots:
     void construction();
     void fileName();
+    void escapesTitle();
+    void escapesDescription();
     void outputDevice();
     void sizeAndViewBox();
     void metric();
@@ -119,6 +121,66 @@
     checkFile(fileName);
 }
 
+void tst_QSvgGenerator::escapesTitle()
+{
+    QByteArray byteArray;
+    QBuffer buffer(&byteArray);
+
+    const QString titleThatNeedsToBeEscaped("<malicious>\"title\" 'oh no'");
+
+    {
+        QSvgGenerator generator;
+
+        generator.setOutputDevice(&buffer);
+        generator.setTitle(titleThatNeedsToBeEscaped);
+
+        QPainter painter(&generator);
+        painter.end();
+    }
+
+    QDomDocument generated;
+    generated.setContent(byteArray);
+
+    const auto titleElements = 
generated.documentElement().elementsByTagName("title");
+
+    QCOMPARE(1, titleElements.size());
+
+    const auto theOnlyTitleElement = titleElements.at(0);
+
+    QCOMPARE(1, theOnlyTitleElement.childNodes().size());
+    QCOMPARE(titleThatNeedsToBeEscaped, 
theOnlyTitleElement.firstChild().nodeValue());
+}
+
+void tst_QSvgGenerator::escapesDescription()
+{
+    QByteArray byteArray;
+    QBuffer buffer(&byteArray);
+
+    const QString descriptionThatNeedsToBeEscaped("<evil>\"description\" 
'whoopsie!'");
+
+    {
+        QSvgGenerator generator;
+
+        generator.setOutputDevice(&buffer);
+        generator.setDescription(descriptionThatNeedsToBeEscaped);
+
+        QPainter painter(&generator);
+        painter.end();
+    }
+
+    QDomDocument generated;
+    generated.setContent(byteArray);
+
+    const auto descriptionElements = 
generated.documentElement().elementsByTagName("desc");
+
+    QCOMPARE(1, descriptionElements.size());
+
+    const auto theOnlyDescriptionElement = descriptionElements.at(0);
+
+    QCOMPARE(1, theOnlyDescriptionElement.childNodes().size());
+    QCOMPARE(descriptionThatNeedsToBeEscaped, 
theOnlyDescriptionElement.firstChild().nodeValue());
+}
+
 void tst_QSvgGenerator::outputDevice()
 {
     QString fileName = "outputDevice_output.svg";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvgplugin/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvgplugin/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvgplugin/CMakeLists.txt 
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvgplugin/CMakeLists.txt 
2023-03-25 20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from qsvgplugin.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qsvgplugin Test:
@@ -8,7 +9,7 @@
 qt_internal_add_test(tst_qsvgplugin
     SOURCES
         tst_qsvgplugin.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
         Qt::GuiPrivate
         Qt::Svg
@@ -44,4 +45,3 @@
     FILES
         ${resources_resource_files}
 )
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvgrenderer/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvgrenderer/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/auto/qsvgrenderer/CMakeLists.txt       
2023-03-11 19:16:56.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/auto/qsvgrenderer/CMakeLists.txt       
2023-03-25 20:28:30.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from qsvgrenderer.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qsvgrenderer Test:
@@ -8,8 +9,8 @@
     SOURCES
         tst_qsvgrenderer.cpp
     DEFINES
-        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
-    PUBLIC_LIBRARIES
+        SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/"
+    LIBRARIES
         Qt::Gui
         Qt::GuiPrivate
         Qt::Svg
@@ -29,4 +30,3 @@
     FILES
         ${resources_resource_files}
 )
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.pro
 
new/qtsvg-everywhere-src-6.5.0/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.pro
--- 
old/qtsvg-everywhere-src-6.4.3/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.pro
   2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.pro
   2023-03-25 20:28:30.000000000 +0100
@@ -7,4 +7,4 @@
 
 QT += svg testlib
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/libfuzzer/svg/qsvgrenderer/render/CMakeLists.txt
 
new/qtsvg-everywhere-src-6.5.0/tests/libfuzzer/svg/qsvgrenderer/render/CMakeLists.txt
--- 
old/qtsvg-everywhere-src-6.4.3/tests/libfuzzer/svg/qsvgrenderer/render/CMakeLists.txt
       2023-03-11 19:16:56.000000000 +0100
+++ 
new/qtsvg-everywhere-src-6.5.0/tests/libfuzzer/svg/qsvgrenderer/render/CMakeLists.txt
       2023-03-25 20:28:30.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.16)
 project(render LANGUAGES CXX)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/manual/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/manual/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/manual/CMakeLists.txt  1970-01-01 
01:00:00.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/manual/CMakeLists.txt  2023-03-25 
20:28:30.000000000 +0100
@@ -0,0 +1,2 @@
+add_subdirectory(cliptests)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/manual/cliptests/CMakeLists.txt 
new/qtsvg-everywhere-src-6.5.0/tests/manual/cliptests/CMakeLists.txt
--- old/qtsvg-everywhere-src-6.4.3/tests/manual/cliptests/CMakeLists.txt        
1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/manual/cliptests/CMakeLists.txt        
2023-03-25 20:28:30.000000000 +0100
@@ -0,0 +1,9 @@
+qt_internal_add_manual_test(svgcliptest
+    SOURCES
+        svgcliptest.cpp
+    INCLUDE_DIRECTORIES
+        .
+    LIBRARIES
+        Qt::Svg
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtsvg-everywhere-src-6.4.3/tests/manual/cliptests/svgcliptest.cpp 
new/qtsvg-everywhere-src-6.5.0/tests/manual/cliptests/svgcliptest.cpp
--- old/qtsvg-everywhere-src-6.4.3/tests/manual/cliptests/svgcliptest.cpp       
1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-everywhere-src-6.5.0/tests/manual/cliptests/svgcliptest.cpp       
2023-03-25 20:28:30.000000000 +0100
@@ -0,0 +1,132 @@
+// 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
+
+#include <QGuiApplication>
+
+#include <QFile>
+
+#include <QSvgGenerator>
+#include <QPainter>
+#include <QBrush>
+#include <QPen>
+#include <QPainterPath>
+#include <QRect>
+#include <QSize>
+
+int main(int argc, char **argv)
+{
+    QGuiApplication app(argc, argv);
+
+    const QStringList arguments = app.arguments();
+    if (arguments.size() < 2) {
+        qWarning("Missing file name");
+        return 0;
+    }
+
+    QFile output(arguments[1]);
+    if (!output.open(QIODevice::WriteOnly))
+        qFatal("Cannot open output file name");
+
+    QSvgGenerator generator(QSvgGenerator::SvgVersion::Svg11);
+    generator.setOutputDevice(&output);
+    generator.setSize(QSize(1000, 500));
+    generator.setViewBox(QRect(0, 0, 1000, 500));
+
+    {
+        QPainter painter(&generator);
+        QFont f = painter.font();
+        f.setPointSize(48);
+        painter.setFont(f);
+
+        {
+            painter.save();
+            // clipped rectangle
+            painter.setClipRect(QRect(100, 100, 250, 200));
+
+            painter.setBrush(QColorConstants::Blue);
+            painter.drawEllipse(QRect(0, 100, 400, 200));
+
+            {
+                painter.save();
+
+                // transformed element within clip
+                painter.setBrush(QColorConstants::Green);
+                painter.translate(300, 150);
+                painter.rotate(45);
+                painter.drawEllipse(QPointF(0, 0), 100, 50);
+
+                painter.restore();
+            }
+
+            painter.drawText(200, 200, "A very long clipped text");
+
+            painter.restore();
+        }
+        {
+            // unclipped
+            painter.setBrush(QColorConstants::Red);
+            painter.drawEllipse(0, 0, 200, 150);
+        }
+        {
+            painter.save();
+
+            // transformed clip (by transforming the painter before setting 
the clip);
+            painter.translate(500, 0);
+            painter.rotate(45);
+
+            painter.setClipRect(QRect(50, 50, 150, 200));
+
+            painter.setBrush(QColorConstants::Green);
+            QPainterPath path;
+            path.addRect(50, 50, 100, 100);
+            path.moveTo(0, 0);
+            path.cubicTo(300, 0,  150, 150,  300, 300);
+            path.cubicTo(0, 300,  150, 150,  0, 0);
+            painter.drawPath(path);
+
+            painter.setBrush(QColorConstants::Blue);
+            painter.drawEllipse(QPointF(125, 125), 100, 50);
+
+            painter.restore();
+        }
+
+        {
+            painter.save();
+
+            // transformed clip
+            painter.translate(700, 50);
+
+            // clip by path
+            QPainterPath path;
+            path.moveTo(0, 0);
+            path.cubicTo(300, 0,  150, 150,  300, 300);
+            path.cubicTo(0, 300,  150, 150,  0, 0);
+
+            painter.setBrush(QColorConstants::Svg::red);
+            painter.drawPath(path);
+
+            painter.setClipPath(path);
+
+            painter.setBrush(QColorConstants::Svg::purple);
+            painter.drawEllipse(QPointF(150, 50), 150, 50);
+
+            // transform and remove clipping
+            painter.translate(0, 100);
+            painter.setClipping(false);
+            painter.setBrush(QColorConstants::Svg::darkblue);
+            painter.drawEllipse(QPointF(150, 50), 150, 50);
+
+            // transform and clip again
+            painter.translate(0, 100);
+            painter.setClipping(true);
+            painter.setBrush(QColorConstants::Svg::green);
+            painter.drawEllipse(QPointF(150, 50), 150, 50);
+
+
+            painter.restore();
+        }
+
+    }
+
+    output.close();
+}

Reply via email to