Hello community, here is the log from the commit of package libqt5-qtsvg for openSUSE:Factory checked in at 2016-05-17 17:05:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtsvg (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtsvg" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtsvg/libqt5-qtsvg.changes 2015-10-19 22:45:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new/libqt5-qtsvg.changes 2016-05-17 17:05:41.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Mar 18 19:03:24 UTC 2016 - [email protected] + +- Update to 5.6.0 + * For more details please see: + http://blog.qt.io/blog/2016/03/16/qt-5-6-released/ + and https://wiki.qt.io/New_Features_in_Qt_5.6 + +------------------------------------------------------------------- Old: ---- qtsvg-opensource-src-5.5.1.tar.xz New: ---- qtsvg-opensource-src-5.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtsvg.spec ++++++ --- /var/tmp/diff_new_pack.A8I1kS/_old 2016-05-17 17:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.A8I1kS/_new 2016-05-17 17:05:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtsvg # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,15 @@ %define libname libQt5Svg5 Name: libqt5-qtsvg -Version: 5.5.1 +Version: 5.6.0 Release: 0 Summary: Qt 5 SVG Library License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.5.1 -%define so_version 5.5.1 +%define real_version 5.6.0 +%define so_version 5.6.0 %define tar_version qtsvg-opensource-src-%{real_version} Source: %{tar_version}.tar.xz Source1: baselibs.conf @@ -114,6 +114,7 @@ find %{buildroot}/%{_libqt5_libdir} -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; # kill .la files rm -f %{buildroot}%{_libqt5_libdir}/lib*.la +mv %{buildroot}/home/abuild/rpmbuild/BUILD/qtsvg-opensource-src-*/examples/svg/richtext/textobject/files/heart.svg %{buildroot}%{_libqt5_examplesdir}/svg/richtext/textobject/files/ %files -n %libname %defattr(-,root,root,755) ++++++ qtsvg-opensource-src-5.5.1.tar.xz -> qtsvg-opensource-src-5.6.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/.qmake.conf new/qtsvg-opensource-src-5.6.0/.qmake.conf --- old/qtsvg-opensource-src-5.5.1/.qmake.conf 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/.qmake.conf 2016-01-19 09:50:20.000000000 +0100 @@ -2,4 +2,4 @@ CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.5.1 +MODULE_VERSION = 5.6.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/.tag new/qtsvg-opensource-src-5.6.0/.tag --- old/qtsvg-opensource-src-5.5.1/.tag 2015-10-13 06:36:57.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/.tag 2016-01-19 09:50:20.000000000 +0100 @@ -1 +1 @@ -23f263b6aa48644f023df3d463215d98d73b9396 +38777ea7451d55e9c3d32d88d46063016013f60c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/doc/src/examples/systray.qdoc new/qtsvg-opensource-src-5.6.0/doc/src/examples/systray.qdoc --- old/qtsvg-opensource-src-5.5.1/doc/src/examples/systray.qdoc 2015-10-13 06:36:57.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/doc/src/examples/systray.qdoc 1970-01-01 01:00:00.000000000 +0100 @@ -1,183 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example desktop/systray - \title System Tray Icon Example - - - The System Tray Icon example shows how to add an icon with a menu - and popup messages to a desktop environment's system tray. - - \image systemtray-example.png Screenshot of the System Tray Icon. - - Modern operating systems usually provide a special area on the - desktop, called the system tray or notification area, where - long-running applications can display icons and short messages. - - This example consists of one single class, \c Window, providing - the main application window (i.e., an editor for the system tray - icon) and the associated icon. - - \image systemtray-editor.png - - The editor allows the user to choose the preferred icon as well as - set the balloon message's type and duration. The user can also - edit the message's title and body. Finally, the editor provide a - checkbox controlling whether the icon is actually shown in the - system tray, or not. - - \section1 Window Class Definition - - The \c Window class inherits QWidget: - - \snippet examples/desktop/systray/window.h 0 - - We implement several private slots to respond to user - interaction. The other private functions are only convenience - functions provided to simplify the constructor. - - The tray icon is an instance of the QSystemTrayIcon class. To - check whether a system tray is present on the user's desktop, call - the static QSystemTrayIcon::isSystemTrayAvailable() - function. Associated with the icon, we provide a menu containing - the typical \gui minimize, \gui maximize, \gui restore and \gui - quit actions. We reimplement the QWidget::setVisible() function to - update the tray icon's menu whenever the editor's appearance - changes, e.g., when maximizing or minimizing the main application - window. - - Finally, we reimplement QWidget's \l {QWidget::}{closeEvent()} - function to be able to inform the user (when closing the editor - window) that the program will keep running in the system tray - until the user chooses the \gui Quit entry in the icon's context - menu. - - \section1 Window Class Implementation - - When constructing the editor widget, we first create the various - editor elements before we create the actual system tray icon: - - \snippet examples/desktop/systray/window.cpp 0 - - We ensure that the application responds to user input by - connecting most of the editor's input widgets (including the - system tray icon) to the application's private slots. But note the - visibility checkbox; its \l {QCheckBox::}{toggled()} signal is - connected to the \e {icon}'s \l {QSystemTrayIcon::}{setVisible()} - function instead. - - \snippet examples/desktop/systray/window.cpp 3 - - The \c setIcon() slot is triggered whenever the current index in - the icon combobox changes, i.e., whenever the user chooses another - icon in the editor. Note that it is also called when the user - activates the tray icon with the left mouse button, triggering the - icon's \l {QSystemTrayIcon::}{activated()} signal. We will come - back to this signal shortly. - - The QSystemTrayIcon::setIcon() function sets the \l - {QSystemTrayIcon::}{icon} property that holds the actual system - tray icon. On Windows, the system tray icon size is 16x16; on X11, - the preferred size is 22x22. The icon will be scaled to the - appropriate size as necessary. - - Note that on X11, due to a limitation in the system tray - specification, mouse clicks on transparent areas in the icon are - propagated to the system tray. If this behavior is unacceptable, - we suggest using an icon with no transparency. - - \snippet examples/desktop/systray/window.cpp 4 - - Whenever the user activates the system tray icon, it emits its \l - {QSystemTrayIcon::}{activated()} signal passing the triggering - reason as parameter. QSystemTrayIcon provides the \l - {QSystemTrayIcon::}{ActivationReason} enum to describe how the - icon was activated. - - In the constructor, we connected our icon's \l - {QSystemTrayIcon::}{activated()} signal to our custom \c - iconActivated() slot: If the user has clicked the icon using the - left mouse button, this function changes the icon image by - incrementing the icon combobox's current index, triggering the \c - setIcon() slot as mentioned above. If the user activates the icon - using the middle mouse button, it calls the custom \c - showMessage() slot: - - \snippet examples/desktop/systray/window.cpp 5 - - When the \e showMessage() slot is triggered, we first retrieve the - message icon depending on the currently chosen message type. The - QSystemTrayIcon::MessageIcon enum describes the icon that is shown - when a balloon message is displayed. Then we call - QSystemTrayIcon's \l {QSystemTrayIcon::}{showMessage()} function - to show the message with the title, body, and icon for the time - specified in milliseconds. - - Mac OS X users note: The Growl notification system must be - installed for QSystemTrayIcon::showMessage() to display messages. - - QSystemTrayIcon also has the corresponding, \l {QSystemTrayIcon::} - {messageClicked()} signal, which is emitted when the user clicks a - message displayed by \l {QSystemTrayIcon::}{showMessage()}. - - \snippet examples/desktop/systray/window.cpp 6 - - In the constructor, we connected the \l - {QSystemTrayIcon::}{messageClicked()} signal to our custom \c - messageClicked() slot that simply displays a message using the - QMessageBox class. - - QMessageBox provides a modal dialog with a short message, an icon, - and buttons laid out depending on the current style. It supports - four severity levels: "Question", "Information", "Warning" and - "Critical". The easiest way to pop up a message box in Qt is to - call one of the associated static functions, e.g., - QMessageBox::information(). - - As we mentioned earlier, we reimplement a couple of QWidget's - virtual functions: - - \snippet examples/desktop/systray/window.cpp 1 - - Our reimplementation of the QWidget::setVisible() function updates - the tray icon's menu whenever the editor's appearance changes, - e.g., when maximizing or minimizing the main application window, - before calling the base class implementation. - - \snippet examples/desktop/systray/window.cpp 2 - - We have reimplemented the QWidget::closeEvent() event handler to - receive widget close events, showing the above message to the - users when they are closing the editor window. - - In addition to the functions and slots discussed above, we have - also implemented several convenience functions to simplify the - constructor: \c createIconGroupBox(), \c createMessageGroupBox(), - \c createActions() and \c createTrayIcon(). See the \l - {desktop/systray/window.cpp}{window.cpp} file for details. -*/ Files old/qtsvg-opensource-src-5.5.1/doc/src/images/systemtray-editor.png and new/qtsvg-opensource-src-5.6.0/doc/src/images/systemtray-editor.png differ Files old/qtsvg-opensource-src-5.5.1/doc/src/images/systemtray-example.png and new/qtsvg-opensource-src-5.6.0/doc/src/images/systemtray-example.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgfont_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qsvgfont_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgfont_p.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/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-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgfunctions_wince_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qsvgfunctions_wince_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgfunctions_wince_p.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qsvgfunctions_wince_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgfunctions_wince_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvggraphics_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvggraphics_p.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/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-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvghandler_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qsvghandler_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvghandler_p.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/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-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgnode_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qsvgnode_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgnode_p.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/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-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgstructure_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgstructure_p.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/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-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgstyle_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgstyle_p.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/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-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qsvgtinydocument_p.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/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-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qtsvgglobal_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.5.1/QtSvg/private/qtsvgglobal_p.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.5.1/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-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgfont_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgfont_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgfont_p.h 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfont_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgfunctions_wince_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgfunctions_wince_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgfunctions_wince_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgfunctions_wince_p.h 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfunctions_wince_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvggraphics_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvggraphics_p.h 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvggraphics_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvghandler_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvghandler_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvghandler_p.h 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvghandler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgnode_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgnode_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgnode_p.h 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgstructure_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgstructure_p.h 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstructure_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgstyle_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgstyle_p.h 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstyle_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qsvgtinydocument_p.h 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qtsvgglobal_p.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/5.6.0/QtSvg/private/qtsvgglobal_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/5.6.0/QtSvg/private/qtsvgglobal_p.h 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qtsvgglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/include/QtSvg/qtsvgversion.h new/qtsvg-opensource-src-5.6.0/include/QtSvg/qtsvgversion.h --- old/qtsvg-opensource-src-5.5.1/include/QtSvg/qtsvgversion.h 2015-10-13 06:36:56.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/include/QtSvg/qtsvgversion.h 2016-03-13 17:17:54.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTSVG_VERSION_H #define QT_QTSVG_VERSION_H -#define QTSVG_VERSION_STR "5.5.1" +#define QTSVG_VERSION_STR "5.6.0" -#define QTSVG_VERSION 0x050501 +#define QTSVG_VERSION 0x050600 #endif // QT_QTSVG_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/src/plugins/imageformats/svg/qsvgiohandler.cpp new/qtsvg-opensource-src-5.6.0/src/plugins/imageformats/svg/qsvgiohandler.cpp --- old/qtsvg-opensource-src-5.5.1/src/plugins/imageformats/svg/qsvgiohandler.cpp 2015-10-13 06:36:57.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/src/plugins/imageformats/svg/qsvgiohandler.cpp 2016-01-19 09:50:20.000000000 +0100 @@ -122,7 +122,7 @@ if (buf.startsWith("\x1f\x8b")) { setFormat("svgz"); return true; - } else if (buf.contains("<?xml") || buf.contains("<svg")) { + } else if (buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--")) { setFormat("svg"); return true; } @@ -251,7 +251,7 @@ bool QSvgIOHandler::canRead(QIODevice *device) { QByteArray buf = device->peek(8); - return buf.startsWith("\x1f\x8b") || buf.contains("<?xml") || buf.contains("<svg"); + return buf.startsWith("\x1f\x8b") || buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--"); } QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/src/svg/doc/qtsvg.qdocconf new/qtsvg-opensource-src-5.6.0/src/svg/doc/qtsvg.qdocconf --- old/qtsvg-opensource-src-5.5.1/src/svg/doc/qtsvg.qdocconf 2015-10-13 06:36:57.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/src/svg/doc/qtsvg.qdocconf 2016-01-19 09:50:20.000000000 +0100 @@ -39,7 +39,7 @@ exampledirs += ../../../examples/svg \ snippets/ -examplesinstallpath = svg +examplesinstallpath = qtsvg/svg imagedirs += images diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/src/svg/qsvgfunctions_wince.cpp new/qtsvg-opensource-src-5.6.0/src/svg/qsvgfunctions_wince.cpp --- old/qtsvg-opensource-src-5.5.1/src/svg/qsvgfunctions_wince.cpp 2015-10-13 06:36:57.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/src/svg/qsvgfunctions_wince.cpp 2016-01-19 09:50:20.000000000 +0100 @@ -36,7 +36,9 @@ #include <winbase.h> #include <kfuncs.h> #include <stdio.h> +#if _WIN32_WCE < 0x800 #include <altcecrt.h> +#endif #include "qplatformdefs.h" #include "qsvgfunctions_wince_p.h" @@ -51,6 +53,7 @@ #endif // File I/O --------------------------------------------------------- +#if _WIN32_WCE < 0x800 int errno = 0; int qt_wince_open(const char *filename, int oflag, int pmode) @@ -116,6 +119,7 @@ return 0; return fclose((FILE*)handle); } +#endif #ifdef __cplusplus } // extern "C" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/src/svg/qsvggraphics.cpp new/qtsvg-opensource-src-5.6.0/src/svg/qsvggraphics.cpp --- old/qtsvg-opensource-src-5.5.1/src/svg/qsvggraphics.cpp 2015-10-13 06:36:57.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/src/svg/qsvggraphics.cpp 2016-01-19 09:50:20.000000000 +0100 @@ -311,9 +311,8 @@ bool appendSpace = false; QVector<QString> paragraphs; QStack<QTextCharFormat> formats; - QVector<QList<QTextLayout::FormatRange> > formatRanges; + QVector<QVector<QTextLayout::FormatRange> > formatRanges(1); paragraphs.push_back(QString()); - formatRanges.push_back(QList<QTextLayout::FormatRange>()); for (int i = 0; i < m_tspans.size(); ++i) { if (m_tspans[i] == LINEBREAK) { @@ -332,7 +331,7 @@ } appendSpace = false; paragraphs.push_back(QString()); - formatRanges.push_back(QList<QTextLayout::FormatRange>()); + formatRanges.resize(formatRanges.size() + 1); } } else { WhitespaceMode mode = m_tspans[i]->whitespaceMode(); @@ -394,7 +393,7 @@ QTextOption op = tl.textOption(); op.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); tl.setTextOption(op); - tl.setAdditionalFormats(formatRanges[i]); + tl.setFormats(formatRanges[i]); tl.beginLayout(); forever { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/src/svg/qsvghandler.cpp new/qtsvg-opensource-src-5.6.0/src/svg/qsvghandler.cpp --- old/qtsvg-opensource-src-5.5.1/src/svg/qsvghandler.cpp 2015-10-13 06:36:57.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/src/svg/qsvghandler.cpp 2016-01-19 09:50:20.000000000 +0100 @@ -62,8 +62,6 @@ static const char *qt_inherit_text = "inherit"; #define QT_INHERIT QLatin1String(qt_inherit_text) -Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); - // ======== duplicated from qcolor_p static inline int qsvg_h2i(char hex) @@ -410,6 +408,7 @@ "rect", "text", "textarea", + "tspan", "use", "video" }; @@ -626,8 +625,7 @@ if (neg) val = -val; } else { - bool ok = false; - val = qstrtod(temp, 0, &ok); + val = QByteArray::fromRawData(temp, pos).toDouble(); } return val; @@ -2285,10 +2283,12 @@ QColor startColor, endColor; resolveColor(fromStr, startColor, handler); resolveColor(toStr, endColor, handler); + colors.reserve(2); colors.append(startColor); colors.append(endColor); } else { QStringList str = valuesStr.split(QLatin1Char(';')); + colors.reserve(str.count()); QStringList::const_iterator itr; for (itr = str.constBegin(); itr != str.constEnd(); ++itr) { QColor color; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/src/svg/svg.pro new/qtsvg-opensource-src-5.6.0/src/svg/svg.pro --- old/qtsvg-opensource-src-5.5.1/src/svg/svg.pro 2015-10-13 06:36:57.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/src/svg/svg.pro 2016-01-19 09:50:20.000000000 +0100 @@ -46,10 +46,10 @@ contains(QT_CONFIG, system-zlib) { if(unix|mingw): LIBS_PRIVATE += -lz - else: LIBS += zdll.lib + else { + isEmpty(ZLIB_LIBS): LIBS += zdll.lib + else: LIBS += $$ZLIB_LIBS + } } else { - git_build: \ - INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib - else: \ - INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib + QT_PRIVATE += zlib-private } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/tests/auto/qicon_svg/icons/triangle.svg new/qtsvg-opensource-src-5.6.0/tests/auto/qicon_svg/icons/triangle.svg --- old/qtsvg-opensource-src-5.5.1/tests/auto/qicon_svg/icons/triangle.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.6.0/tests/auto/qicon_svg/icons/triangle.svg 2016-01-19 09:50:20.000000000 +0100 @@ -0,0 +1,12 @@ +<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In --> +<svg version="1.1" + xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"; + x="0px" y="0px" width="39.2px" height="39.2px" viewBox="0 0 39.2 39.2" style="enable-background:new 0 0 39.2 39.2;" + xml:space="preserve"> +<style type="text/css"> + .st1{fill:#1B1E23;} +</style> +<defs> +</defs> +<polygon class="st1" points="15.3,11.3 29.2,19.6 15.3,27.9 "/> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.5.1/tests/auto/qicon_svg/tst_qicon_svg.cpp new/qtsvg-opensource-src-5.6.0/tests/auto/qicon_svg/tst_qicon_svg.cpp --- old/qtsvg-opensource-src-5.5.1/tests/auto/qicon_svg/tst_qicon_svg.cpp 2015-10-13 06:36:57.000000000 +0200 +++ new/qtsvg-opensource-src-5.6.0/tests/auto/qicon_svg/tst_qicon_svg.cpp 2016-01-19 09:50:20.000000000 +0100 @@ -60,6 +60,7 @@ QFAIL("Can't find images directory!"); if (!QImageReader::supportedImageFormats().contains("svg")) QFAIL("SVG support is not available"); + QCOMPARE(QImageReader::imageFormat(prefix + "triangle.svg"), QByteArray("svg")); } void tst_QIcon_Svg::svgActualSize()
