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 2022-04-20 16:56:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-svg (Old) and /work/SRC/openSUSE:Factory/.qt6-svg.new.1941 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-svg" Wed Apr 20 16:56:03 2022 rev:14 rq:970810 version:6.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-svg/qt6-svg.changes 2022-03-29 18:15:06.807113786 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-svg.new.1941/qt6-svg.changes 2022-04-20 16:56:22.070569122 +0200 @@ -1,0 +2,11 @@ +Fri Apr 8 11:57:01 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 6.3.0: + * https://www.qt.io/blog/qt-6.3-released + +------------------------------------------------------------------- +Tue Mar 29 12:28:41 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 6.3.0-rc + +------------------------------------------------------------------- Old: ---- qtsvg-everywhere-src-6.2.4.tar.xz New: ---- qtsvg-everywhere-src-6.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-svg.spec ++++++ --- /var/tmp/diff_new_pack.1WNHgR/_old 2022-04-20 16:56:23.462570422 +0200 +++ /var/tmp/diff_new_pack.1WNHgR/_new 2022-04-20 16:56:23.466570426 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt6-svg # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 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.2.4 -%define short_version 6.2 +%define real_version 6.3.0 +%define short_version 6.3 %define tar_name qtsvg-everywhere-src %define tar_suffix %{nil} # @@ -27,7 +27,7 @@ %endif # Name: qt6-svg%{?pkg_suffix} -Version: 6.2.4 +Version: 6.3.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) ++++++ qtsvg-everywhere-src-6.2.4.tar.xz -> qtsvg-everywhere-src-6.3.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/.QT-ENTERPRISE-LICENSE-AGREEMENT new/qtsvg-everywhere-src-6.3.0/.QT-ENTERPRISE-LICENSE-AGREEMENT --- old/qtsvg-everywhere-src-6.2.4/.QT-ENTERPRISE-LICENSE-AGREEMENT 2022-03-10 11:21:31.860042800 +0100 +++ new/qtsvg-everywhere-src-6.3.0/.QT-ENTERPRISE-LICENSE-AGREEMENT 2022-04-06 19:56:41.481723500 +0200 @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.4 +Agreement version 4.4.1 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -233,7 +233,7 @@ United States or a legal entity incorporated outside of the United States or having its registered office outside of the United States, The Qt Company Ltd., a Finnish company with its registered office at - Bertel Jungin aukio D3A, 02600 Espoo, Finland. + Miestentie 7, 02150 Espoo, Finland. "Third-Party Software" shall have the meaning set forth in Section 4. @@ -1054,8 +1054,8 @@ - Appendix 1: Licensed Software details - Appendix 2: Pricing - Appendix 3: Add-on Software details (optional) -- Appendix 4: Non-commercial and educational Licenses (optional) -- Appendix 5: Small business and startup Licenses (optional) +- Appendix 4: Small business and startup Licenses (optional) +- Appendix 5: Non-commercial and educational Licenses (optional) - Appendix 6: License Reporting (optional) - Appendix 7: Marketing Rights (optional) - Appendix 8: Intentionally left blank (optional) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/.cmake.conf new/qtsvg-everywhere-src-6.3.0/.cmake.conf --- old/qtsvg-everywhere-src-6.2.4/.cmake.conf 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/.cmake.conf 2022-04-05 16:01:22.000000000 +0200 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.4") -set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") +set(QT_REPO_MODULE_VERSION "6.3.0") +set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/.qmake.conf new/qtsvg-everywhere-src-6.3.0/.qmake.conf --- old/qtsvg-everywhere-src-6.2.4/.qmake.conf 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/.qmake.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -load(qt_build_config) - -CONFIG += warning_clean -DEFINES += QT_NO_FOREACH - -MODULE_VERSION = 6.2.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/.tag new/qtsvg-everywhere-src-6.3.0/.tag --- old/qtsvg-everywhere-src-6.2.4/.tag 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/.tag 2022-04-05 16:01:22.000000000 +0200 @@ -1 +1 @@ -0237fcf58c8978c35386b2b7d38f306da0f20af2 +8c0a12af45ea0053da04dba12941c7643090aa0d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -10,14 +10,15 @@ LANGUAGES CXX C ) -# special case begin -# Make sure we only use latest private CMake API, aka no compatibility wrappers. -set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) - -# Make sure we use the fixed BASE argument of qt_add_resource. -set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) -# special case end - 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 + +# Needed for examples to configure properly when not using ExternalProject and when +# Qt is configured with a bundled zlib. +# Otherwise Qt6SvgDependencies will claim Qt6ZlibPrivate_FOUND is FALSE because we +# set QT_NO_CREATE_TARGETS to TRUE when building examples in-tree. +if(NOT QT_FEATURE_system_zlib) + find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS ZlibPrivate) +endif() + qt_build_repo() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/dependencies.yaml new/qtsvg-everywhere-src-6.3.0/dependencies.yaml --- old/qtsvg-everywhere-src-6.2.4/dependencies.yaml 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/dependencies.yaml 2022-04-05 16:01:22.000000000 +0200 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: d3b5353380797f3b67599ccebc5dc916057681e5 + ref: 9554d315aa74eaba1726405ee09117e2ebc6111f required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,6 +1,4 @@ -# Generated from examples.pro. - -qt_examples_build_begin() +qt_examples_build_begin(EXTERNAL_BUILD) add_subdirectory(svg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,10 +1,8 @@ -# Generated from svg.pro. - add_subdirectory(embedded) add_subdirectory(richtext) add_subdirectory(draganddrop) if(TARGET Qt::Widgets) - add_subdirectory(embeddedsvgviewer) - add_subdirectory(svggenerator) - add_subdirectory(svgviewer) + qt_internal_add_example(embeddedsvgviewer) + qt_internal_add_example(svggenerator) + qt_internal_add_example(svgviewer) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/draganddrop/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/draganddrop/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/draganddrop/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/draganddrop/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,5 +1,3 @@ -# Generated from draganddrop.pro. - if(TARGET Qt::Widgets) - add_subdirectory(delayedencoding) + qt_internal_add_example(delayedencoding) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/draganddrop/delayedencoding/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/draganddrop/delayedencoding/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/draganddrop/delayedencoding/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/draganddrop/delayedencoding/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,35 +1,27 @@ -# Generated from delayedencoding.pro. - cmake_minimum_required(VERSION 3.16) project(delayedencoding LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/svg/draganddrop/delayedencoding") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) -find_package(Qt6 COMPONENTS SvgWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg SvgWidgets Widgets) qt_add_executable(delayedencoding main.cpp mimedata.cpp mimedata.h sourcewidget.cpp sourcewidget.h ) + set_target_properties(delayedencoding PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(delayedencoding PUBLIC Qt::Core Qt::Gui @@ -38,7 +30,6 @@ Qt::Widgets ) - # Resources: set(delayedencoding_resource_files "images/drag.png" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,11 +1,9 @@ -# Generated from embedded.pro. - if(TARGET Qt::Widgets) - add_subdirectory(desktopservices) + qt_internal_add_example(desktopservices) endif() if(QT_FEATURE_process AND TARGET Qt::Widgets) - add_subdirectory(fluidlauncher) + qt_internal_add_example(fluidlauncher) endif() if(TARGET Qt::Network AND TARGET Qt::Widgets) - add_subdirectory(weatherinfo) + qt_internal_add_example(weatherinfo) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/desktopservices/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/desktopservices/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/desktopservices/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/desktopservices/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,23 +1,15 @@ -# Generated from desktopservices.pro. - cmake_minimum_required(VERSION 3.16) project(desktopservices LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/svg/embedded/desktopservices") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(desktopservices contenttab.cpp contenttab.h @@ -25,17 +17,18 @@ linktab.cpp linktab.h main.cpp ) + set_target_properties(desktopservices PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(desktopservices PUBLIC Qt::Core Qt::Gui Qt::Widgets ) - # Resources: set(desktopservices_resource_files "resources/browser.png" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/fluidlauncher/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/fluidlauncher/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/fluidlauncher/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/fluidlauncher/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,23 +1,15 @@ -# Generated from fluidlauncher.pro. - cmake_minimum_required(VERSION 3.16) project(fluidlauncher LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/svg/embedded/fluidlauncher") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(fluidlauncher demoapplication.cpp demoapplication.h @@ -26,17 +18,18 @@ pictureflow.cpp pictureflow.h slideshow.cpp slideshow.h ) + set_target_properties(fluidlauncher PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(fluidlauncher PUBLIC Qt::Core Qt::Gui Qt::Widgets ) - # Resources: set(fluidlauncher_resource_files "config.xml" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/weatherinfo/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/weatherinfo/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/weatherinfo/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/weatherinfo/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,34 +1,25 @@ -# Generated from weatherinfo.pro. - cmake_minimum_required(VERSION 3.16) project(svgweatherinfo LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/svg/embedded/weatherinfo") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Network) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) -find_package(Qt6 COMPONENTS SvgWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Svg SvgWidgets Widgets) qt_add_executable(svgweatherinfo weatherinfo.cpp ) + set_target_properties(svgweatherinfo PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(svgweatherinfo PUBLIC Qt::Core Qt::Gui @@ -38,7 +29,6 @@ Qt::Widgets ) - # Resources: set(weatherinfo_resource_files "icons/weather-few-clouds.svg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/weatherinfo/weatherinfo.cpp new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/weatherinfo/weatherinfo.cpp --- old/qtsvg-everywhere-src-6.2.4/examples/svg/embedded/weatherinfo/weatherinfo.cpp 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/embedded/weatherinfo/weatherinfo.cpp 2022-04-05 16:01:22.000000000 +0200 @@ -332,7 +332,7 @@ } void createNewDay(QXmlStreamReader &xml) { - QGraphicsTextItem *dayItem = 0; + QGraphicsTextItem *dayItem = nullptr; QString lowT; QString highT; QString period = GET_DATA_ATTR("period"); @@ -384,7 +384,7 @@ } void saveDayItem(QGraphicsTextItem *dayItem, QString lowT, QString highT, QString symbolToShow) { - QGraphicsSvgItem *statusItem = 0; + QGraphicsSvgItem *statusItem = nullptr; if (!symbolToShow.isEmpty()) { statusItem = new QGraphicsSvgItem(symbolToShow); m_scene.addItem(statusItem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/embeddedsvgviewer/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/embeddedsvgviewer/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/embeddedsvgviewer/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/embeddedsvgviewer/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,33 +1,26 @@ -# Generated from embeddedsvgviewer.pro. - cmake_minimum_required(VERSION 3.16) project(embeddedsvgviewer LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/svg/embeddedsvgviewer") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg Widgets) qt_add_executable(embeddedsvgviewer embeddedsvgviewer.cpp embeddedsvgviewer.h main.cpp ) + set_target_properties(embeddedsvgviewer PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(embeddedsvgviewer PUBLIC Qt::Core Qt::Gui @@ -35,7 +28,6 @@ Qt::Widgets ) - # Resources: set(embeddedsvgviewer_resource_files "files/default.svg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/richtext/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/richtext/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/richtext/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/richtext/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,5 +1,3 @@ -# Generated from richtext.pro. - if(TARGET Qt::Widgets) - add_subdirectory(textobject) + qt_internal_add_example(textobject) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/richtext/textobject/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/richtext/textobject/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/richtext/textobject/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/richtext/textobject/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,34 +1,27 @@ -# Generated from textobject.pro. - cmake_minimum_required(VERSION 3.16) project(textobject LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/svg/richtext/textobject") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg Widgets) qt_add_executable(textobject main.cpp svgtextobject.cpp svgtextobject.h window.cpp window.h ) + set_target_properties(textobject PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(textobject PUBLIC Qt::Core Qt::Gui @@ -36,7 +29,6 @@ Qt::Widgets ) - # Resources: set(resources_resource_files "files/heart.svg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/svggenerator/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/svggenerator/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/svggenerator/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/svggenerator/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,24 +1,16 @@ -# Generated from svggenerator.pro. - cmake_minimum_required(VERSION 3.16) project(svggenerator LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/svg/svggenerator") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg Widgets) qt_add_executable(svggenerator displaywidget.cpp displaywidget.h @@ -26,13 +18,16 @@ main.cpp window.cpp window.h ) + set_target_properties(svggenerator PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_include_directories(svggenerator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) + set_target_properties(svggenerator PROPERTIES AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/forms") @@ -43,7 +38,6 @@ Qt::Widgets ) - # Resources: set(svggenerator_resource_files "resources/shapes.dat" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/examples/svg/svgviewer/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/examples/svg/svgviewer/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/examples/svg/svgviewer/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/examples/svg/svgviewer/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -1,25 +1,15 @@ -# Generated from svgviewer.pro. - cmake_minimum_required(VERSION 3.16) project(svgviewer LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/svg/svgviewer") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) -find_package(Qt6 COMPONENTS SvgWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg SvgWidgets Widgets) qt_add_executable(svgviewer exportdialog.cpp exportdialog.h @@ -27,10 +17,12 @@ mainwindow.cpp mainwindow.h svgview.cpp svgview.h ) + set_target_properties(svgviewer PROPERTIES WIN32_EXECUTABLE FALSE MACOSX_BUNDLE TRUE ) + target_link_libraries(svgviewer PUBLIC Qt::Core Qt::Gui @@ -39,7 +31,6 @@ Qt::Widgets ) - # Resources: set(svgviewer_resource_files "files/bubbles.svg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgfont_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/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.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvggraphics_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/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.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvghandler_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/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.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgnode_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/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.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgstructure_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/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.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgstyle_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/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.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.2.4/QtSvg/private/qsvgtinydocument_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/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.2.4/include/QtSvg/6.2.4/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.2.4/QtSvg/private/qtsvgglobal_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.2.4/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.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgfont_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfont_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvggraphics_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvggraphics_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvghandler_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvghandler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgnode_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgstructure_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstructure_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgstyle_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstyle_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qsvgtinydocument_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/6.3.0/QtSvg/private/qtsvgglobal_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/6.3.0/QtSvg/private/qtsvgglobal_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qtsvgglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvg/qtsvgversion.h new/qtsvg-everywhere-src-6.3.0/include/QtSvg/qtsvgversion.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvg/qtsvgversion.h 2022-03-10 11:21:31.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvg/qtsvgversion.h 2022-04-06 19:56:41.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTSVG_VERSION_H #define QT_QTSVG_VERSION_H -#define QTSVG_VERSION_STR "6.2.4" +#define QTSVG_VERSION_STR "6.3.0" -#define QTSVG_VERSION 0x060204 +#define QTSVG_VERSION 0x060300 #endif // QT_QTSVG_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/include/QtSvgWidgets/qtsvgwidgetsversion.h new/qtsvg-everywhere-src-6.3.0/include/QtSvgWidgets/qtsvgwidgetsversion.h --- old/qtsvg-everywhere-src-6.2.4/include/QtSvgWidgets/qtsvgwidgetsversion.h 2022-03-10 11:21:31.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/include/QtSvgWidgets/qtsvgwidgetsversion.h 2022-04-06 19:56:41.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTSVGWIDGETS_VERSION_H #define QT_QTSVGWIDGETS_VERSION_H -#define QTSVGWIDGETS_VERSION_STR "6.2.4" +#define QTSVGWIDGETS_VERSION_STR "6.3.0" -#define QTSVGWIDGETS_VERSION 0x060204 +#define QTSVGWIDGETS_VERSION 0x060300 #endif // QT_QTSVGWIDGETS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/src/svg/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/src/svg/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -36,6 +36,8 @@ PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::GuiPrivate + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) ## Scopes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/doc/qtsvg.qdocconf new/qtsvg-everywhere-src-6.3.0/src/svg/doc/qtsvg.qdocconf --- old/qtsvg-everywhere-src-6.2.4/src/svg/doc/qtsvg.qdocconf 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/doc/qtsvg.qdocconf 2022-04-05 16:01:22.000000000 +0200 @@ -13,9 +13,6 @@ qhp.QtSvg.indexTitle = Qt SVG qhp.QtSvg.indexRoot = -qhp.QtSvg.filterAttributes = qtsvg $QT_VERSION qtrefdoc -qhp.QtSvg.customFilters.Qt.name = QtSvg $QT_VERSION -qhp.QtSvg.customFilters.Qt.filterAttributes = qtsvg $QT_VERSION qhp.QtSvg.subprojects = classes qhp.QtSvg.subprojects.classes.title = C++ Classes qhp.QtSvg.subprojects.classes.indexTitle = Qt SVG C++ Classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/doc/src/qtsvg-index.qdoc new/qtsvg-everywhere-src-6.3.0/src/svg/doc/src/qtsvg-index.qdoc --- old/qtsvg-everywhere-src-6.2.4/src/svg/doc/src/qtsvg-index.qdoc 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/doc/src/qtsvg-index.qdoc 2022-04-05 16:01:22.000000000 +0200 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt SVG module. @@ -35,17 +35,38 @@ for rendering and displaying SVG drawings in widgets and on other paint devices. - \section1 Getting Started + \section1 Using the Module - Qt SVG provides classes for rendering SVG files. To include the definitions - of the module's classes, use the following directive: + \include {module-use.qdocinc} {using the c++ api} - \snippet doc_src_qtsvg.cpp 0 + \section2 Building with CMake - To link against the module, add this line to your \l qmake \c - .pro file: + \include {module-use.qdocinc} {building with cmake} {Svg} - \snippet doc_src_qtsvg.pro 1 + \section2 Building with qmake + + \include {module-use.qdocinc} {building with cmake} {svg} + + \section1 Articles and Guides + + \list + \li \l {Rendering SVG Files} contains information about how to + render SVG files + \endlist + + \section1 Examples + + \list + \li \l {SVG Generator Example} + \li \l {SVG Viewer Example} + \endlist + + \section1 References + + \list + \li \l {Qt SVG C++ Classes} + \li \l {Qt SVG Widgets C++ Classes} + \endlist \section1 Module Evolution \l{Changes to Qt SVG} lists important changes in the module API @@ -59,27 +80,8 @@ the \l{GNU General Public License, version 2}. See \l{Qt Licensing} for further details. - Furthermore Qt SVG contains third party + Furthermore, Qt SVG contains third party code under following permissive licenses: \generatelist{groupsbymodule attributions-qtsvg} - - \section1 Articles - \list - \li \l{Rendering SVG Files}??contains information about how to - render SVG files - \endlist - - \section1 References - \list - \li \l{Qt SVG C++ Classes} - \li \l{Qt SVG Widgets C++ Classes} - \endlist - - Qt SVG comes with the following examples: - - \list - \li \l{SVG Generator Example} - \li \l{SVG Viewer Example} - \endlist */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/qsvggenerator.cpp new/qtsvg-everywhere-src-6.3.0/src/svg/qsvggenerator.cpp --- old/qtsvg-everywhere-src-6.2.4/src/svg/qsvggenerator.cpp 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/qsvggenerator.cpp 2022-04-05 16:01:22.000000000 +0200 @@ -90,7 +90,7 @@ { size = QSize(); viewBox = QRectF(); - outputDevice = 0; + outputDevice = nullptr; resolution = 72; attributes.document_title = QLatin1String("Qt SVG Document"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/qsvghandler.cpp new/qtsvg-everywhere-src-6.3.0/src/svg/qsvghandler.cpp --- old/qtsvg-everywhere-src-6.2.4/src/svg/qsvghandler.cpp 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/qsvghandler.cpp 2022-04-05 16:01:22.000000000 +0200 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt SVG module of the Qt Toolkit. @@ -1178,13 +1178,11 @@ } else if (state == SkewX) { if (points.count() != 1) goto error; - const qreal deg2rad = qreal(0.017453292519943295769); - matrix.shear(qTan(points[0]*deg2rad), 0); + matrix.shear(qTan(qDegreesToRadians(points[0])), 0); } else if (state == SkewY) { if (points.count() != 1) goto error; - const qreal deg2rad = qreal(0.017453292519943295769); - matrix.shear(0, qTan(points[0]*deg2rad)); + matrix.shear(0, qTan(qDegreesToRadians(points[0]))); } } error: @@ -1342,7 +1340,7 @@ return; QSvgTinyDocument *doc = node->document(); - QSvgFontStyle *fontStyle = 0; + QSvgFontStyle *fontStyle = nullptr; if (!attributes.fontFamily.isEmpty()) { QSvgFont *svgFont = doc->svgFont(attributes.fontFamily.toString()); if (svgFont) @@ -3388,7 +3386,7 @@ QString linkId = attributes.value(QLatin1String("xlink:href")).toString().remove(0, 1); const QStringView xStr = attributes.value(QLatin1String("x")); const QStringView yStr = attributes.value(QLatin1String("y")); - QSvgStructureNode *group = 0; + QSvgStructureNode *group = nullptr; if (linkId.isEmpty()) linkId = attributes.value(QLatin1String("href")).toString().remove(0, 1); @@ -3706,7 +3704,7 @@ bool QSvgHandler::startElement(const QString &localName, const QXmlStreamAttributes &attributes) { - QSvgNode *node = 0; + QSvgNode *node = nullptr; pushColorCopy(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgnode.cpp new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgnode.cpp --- old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgnode.cpp 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgnode.cpp 2022-04-05 16:01:22.000000000 +0200 @@ -239,7 +239,7 @@ QSvgTinyDocument * QSvgNode::document() const { - QSvgTinyDocument *doc = 0; + QSvgTinyDocument *doc = nullptr; QSvgNode *node = const_cast<QSvgNode*>(this); while (node && node->type() != QSvgNode::DOC) { node = node->parent(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgstructure.cpp new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgstructure.cpp --- old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgstructure.cpp 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgstructure.cpp 2022-04-05 16:01:22.000000000 +0200 @@ -372,7 +372,7 @@ QSvgNode * QSvgStructureNode::previousSiblingNode(QSvgNode *n) const { - QSvgNode *prev = 0; + QSvgNode *prev = nullptr; QList<QSvgNode*>::const_iterator itr = m_renderers.constBegin(); for (; itr != m_renderers.constEnd(); ++itr) { QSvgNode *node = *itr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgstyle.cpp new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgstyle.cpp --- old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgstyle.cpp 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgstyle.cpp 2022-04-05 16:01:22.000000000 +0200 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt SVG module of the Qt Toolkit. @@ -158,7 +158,7 @@ void QSvgFillStyle::setBrush(QBrush brush) { m_fill = std::move(brush); - m_style = 0; + m_style = nullptr; m_fillSet = 1; } @@ -686,7 +686,6 @@ void QSvgAnimateTransform::resolveMatrix(const QSvgNode *node) { - static const qreal deg2rad = qreal(0.017453292519943295769); qreal totalTimeElapsed = node->document()->currentElapsed(); if (totalTimeElapsed < m_from || m_finished) return; @@ -786,7 +785,7 @@ qreal transXDiff = (to1-from1) * percentOfAnimation; qreal transX = from1 + transXDiff; m_transform = QTransform(); - m_transform.shear(qTan(transX * deg2rad), 0); + m_transform.shear(qTan(qDegreesToRadians(transX)), 0); break; } case SkewY: { @@ -801,7 +800,7 @@ qreal transYDiff = (to1 - from1) * percentOfAnimation; qreal transY = from1 + transYDiff; m_transform = QTransform(); - m_transform.shear(0, qTan(transY * deg2rad)); + m_transform.shear(0, qTan(qDegreesToRadians(transY))); break; } default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgstyle_p.h new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgstyle_p.h --- old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgstyle_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgstyle_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -70,7 +70,7 @@ template <class T> class QSvgRefCounter { public: - QSvgRefCounter() { t = 0; } + QSvgRefCounter() { t = nullptr; } QSvgRefCounter(T *_t) { t = _t; @@ -424,7 +424,7 @@ void setStroke(QBrush brush) { m_stroke.setBrush(brush); - m_style = 0; + m_style = nullptr; m_strokeSet = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgtinydocument.cpp new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgtinydocument.cpp --- old/qtsvg-everywhere-src-6.2.4/src/svg/qsvgtinydocument.cpp 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/qsvgtinydocument.cpp 2022-04-05 16:01:22.000000000 +0200 @@ -202,7 +202,7 @@ return load(qt_inflateSvgzDataFrom(&file)); } - QSvgTinyDocument *doc = 0; + QSvgTinyDocument *doc = nullptr; QSvgHandler handler(&file); if (handler.ok()) { doc = handler.document(); @@ -248,7 +248,7 @@ { QSvgHandler handler(contents); - QSvgTinyDocument *doc = 0; + QSvgTinyDocument *doc = nullptr; if (handler.ok()) { doc = handler.document(); doc->m_animationDuration = handler.animationDuration(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/qtsvgglobal.h new/qtsvg-everywhere-src-6.3.0/src/svg/qtsvgglobal.h --- old/qtsvg-everywhere-src-6.2.4/src/svg/qtsvgglobal.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/qtsvgglobal.h 2022-04-05 16:01:22.000000000 +0200 @@ -41,21 +41,6 @@ #define QTSVGGLOBAL_H #include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef Q_SVG_EXPORT -# ifndef QT_STATIC -# if defined(QT_BUILD_SVG_LIB) -# define Q_SVG_EXPORT Q_DECL_EXPORT -# else -# define Q_SVG_EXPORT Q_DECL_IMPORT -# endif -# else -# define Q_SVG_EXPORT -# endif -#endif - -QT_END_NAMESPACE +#include <QtSvg/qtsvgexports.h> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svg/qtsvgglobal_p.h new/qtsvg-everywhere-src-6.3.0/src/svg/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-6.2.4/src/svg/qtsvgglobal_p.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svg/qtsvgglobal_p.h 2022-04-05 16:01:22.000000000 +0200 @@ -52,7 +52,6 @@ // #include "qtsvgglobal.h" - -#define Q_SVG_PRIVATE_EXPORT Q_SVG_EXPORT +#include <QtSvg/private/qtsvgexports_p.h> #endif // QTSVGGLOBAL_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svgwidgets/CMakeLists.txt new/qtsvg-everywhere-src-6.3.0/src/svgwidgets/CMakeLists.txt --- old/qtsvg-everywhere-src-6.2.4/src/svgwidgets/CMakeLists.txt 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svgwidgets/CMakeLists.txt 2022-04-05 16:01:22.000000000 +0200 @@ -23,6 +23,7 @@ Qt::CorePrivate Qt::GuiPrivate Qt::WidgetsPrivate + GENERATE_CPP_EXPORTS ) qt_internal_extend_target(SvgWidgets CONDITION QT_FEATURE_graphicsview diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/src/svgwidgets/qtsvgwidgetsglobal.h new/qtsvg-everywhere-src-6.3.0/src/svgwidgets/qtsvgwidgetsglobal.h --- old/qtsvg-everywhere-src-6.2.4/src/svgwidgets/qtsvgwidgetsglobal.h 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/src/svgwidgets/qtsvgwidgetsglobal.h 2022-04-05 16:01:22.000000000 +0200 @@ -41,21 +41,6 @@ #define QTSVGWIDGETSGLOBAL_H #include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef Q_SVGWIDGETS_EXPORT -# ifndef QT_STATIC -# if defined(QT_BUILD_SVGWIDGETS_LIB) -# define Q_SVGWIDGETS_EXPORT Q_DECL_EXPORT -# else -# define Q_SVGWIDGETS_EXPORT Q_DECL_IMPORT -# endif -# else -# define Q_SVGWIDGETS_EXPORT -# endif -#endif - -QT_END_NAMESPACE +#include <QtSvgWidgets/qtsvgwidgetsexports.h> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.2.4/tests/libfuzzer/svg/qsvgrenderer/render/render.pro new/qtsvg-everywhere-src-6.3.0/tests/libfuzzer/svg/qsvgrenderer/render/render.pro --- old/qtsvg-everywhere-src-6.2.4/tests/libfuzzer/svg/qsvgrenderer/render/render.pro 2022-03-04 05:15:36.000000000 +0100 +++ new/qtsvg-everywhere-src-6.3.0/tests/libfuzzer/svg/qsvgrenderer/render/render.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -QT += svg -QTPLUGIN *= qminimal -SOURCES += main.cpp -FUZZ_ENGINE = $$(LIB_FUZZING_ENGINE) -isEmpty(FUZZ_ENGINE) { - QMAKE_LFLAGS += -fsanitize=fuzzer -} else { - LIBS += $$FUZZ_ENGINE -}
