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 2021-03-17 20:14:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-svg (Old) and /work/SRC/openSUSE:Factory/.qt6-svg.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-svg" Wed Mar 17 20:14:39 2021 rev:3 rq:878008 version:6.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-svg/qt6-svg.changes 2020-12-24 19:38:42.747033901 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-svg.new.2401/qt6-svg.changes 2021-03-17 20:18:46.143220264 +0100 @@ -1,0 +2,12 @@ +Tue Mar 9 13:36:09 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 6.0.2: + https://www.qt.io/blog/qt-6.0.2-released + +------------------------------------------------------------------- +Wed Feb 3 17:29:08 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 6.0.1 + https://www.qt.io/blog/qt-6.0.1-released + +------------------------------------------------------------------- Old: ---- qtsvg-everywhere-src-6.0.0.tar.xz New: ---- qtsvg-everywhere-src-6.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-svg.spec ++++++ --- /var/tmp/diff_new_pack.i7rAZn/_old 2021-03-17 20:18:49.643225048 +0100 +++ /var/tmp/diff_new_pack.i7rAZn/_new 2021-03-17 20:18:49.647225053 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt6-svg # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define real_version 6.0.0 +%define real_version 6.0.2 %define short_version 6.0 %define tar_name qtsvg-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-svg%{?pkg_suffix} -Version: 6.0.0 +Version: 6.0.2 Release: 0 Summary: Qt 6 SVG Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtsvg-everywhere-src-6.0.0.tar.xz -> qtsvg-everywhere-src-6.0.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT new/qtsvg-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT --- old/qtsvg-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT 2020-12-05 08:01:41.682986300 +0100 +++ new/qtsvg-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT 2021-02-25 06:44:11.754212600 +0100 @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.2.3 +Agreement version 4.3 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -159,14 +159,8 @@ "Party" or "Parties" shall mean Licensee and/or The Qt Company. -"Permitted Software" shall mean any (i) open source software (excluding Open -Source Qt) that is a) generally available for public in source code form -without additional cost under any of the licenses approved by Open Source -Initiative as listed on https://opensource.org/licenses; and (b) is in no -way, directly or indirectly, developed by or for or otherwise related to or -in the interest of the Licensee or its Affiliates, or (ii) software The Qt -Company has made available via its Qt Marketplace online distribution -channel. +"Permitted Combination" shall have the meaning as set forth in Section +3.4(viii). "Pre-Release Code" shall have the meaning as set forth in Section 4. @@ -308,10 +302,10 @@ Upon expiry of the initially agreed License Term, the respective License Terms shall be automatically extended to one or more Renewal Term(s), unless and -until either Party notifies the other Party in writing that it does not wish -to continue the License Term, such notification to be provided to the other -Party no less than thirty (30) days before expiry of the respective License -Term. +until either Party notifies the other Party in writing, or any other method +acceptable to The Qt Company, that it does not wish to continue the License +Term, such notification to be provided to the other Party no less than thirty +(30) days before expiry of the respective License Term. Unless otherwise agreed between the Parties, Renewal Term shall be of equal length with the initial License Term. @@ -323,8 +317,10 @@ Any price or other term specified for a Renewal Term shall be valid only for the specified time. -The Qt Company may request the Licensee to place a purchase order corresponding -to a quote by The Qt Company for the relevant Renewal Term. +The Qt Company may either request the Licensee to place a purchase order +corresponding to a quote by The Qt Company, or uses Licensees stored Credit +Card information in the QtAccount to automatically charge the Licensee for the +relevant Renewal Term. In the event Licensee does not prevent auto-renewal pursuant the above, but a Renewal Term is nevertheless not duly ordered within 30 days from the date of @@ -750,11 +746,13 @@ Notwithstanding the above, in the event the Agreement expires or is terminated: (i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses - possessed by the Licensee at such date shall be extended to be valid - in perpetuity under the terms of this Agreement and Licensee is - entitled to purchase additional licenses as set forth in - Section 10.2; or + License(s) as set forth in Section 3.1, and where such decision of + non-renewal is not due to any ongoing breach or alleged breach (as + reasonably determined by The Qt Company) by Licensee of the terms of this + Agreement or any applicable license terms of Open Source Qt, then all valid + licenses possessed by the Licensee at such date shall be extended to be + valid in perpetuity under the terms of this Agreement and Licensee is + entitled to purchase additional licenses as set forth in Section 10.2; or (ii) for reason other than by The Qt Company pursuant to item (i) above or pursuant to Section 12.2, then the Licensee is entitled, for a period of six (6) months after the effective date of termination, @@ -950,7 +948,8 @@ The modules and/or tools that are included in the respective product - Qt for Application Development (QtAD), Qt for Device Creation (QtDC), Qt for MCUs (QtMCU), Qt 3D Studio (Qt3DS) and Qt Design Studio (QtDS) - are -marked with 'X' in the below table. +marked with 'X' in the below table. The modules and tools are ported to Qt 6 +in stages and are subject to availability. Parts of the product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below table. @@ -968,6 +967,8 @@ +-----------------------------------------------------------------------+ | Qt Network | X, R | X, R | | | | +-----------------------------------------------------------------------+ +| Qt PDF | X, R | X, R | | | | ++-----------------------------------------------------------------------+ | Qt QML | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Quick | X, R | X, R | | | | @@ -1066,7 +1067,7 @@ +-----------------------------------------------------------------------+ | Qt Charts | X, R | X, R | | | | +-----------------------------------------------------------------------+ -| Qt Data visualization | X, R | X, R | | | | +| Qt Data Visualization | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Virtual Keyboard | X, R | X, R | | | | +-----------------------------------------------------------------------+ @@ -1086,16 +1087,16 @@ +-----------------------------------------------------------------------+ | Qt Designer (Qt Widget Designer) | X | X | | | | +-----------------------------------------------------------------------+ -| Qt Quick Designer (Qt Creator | X | X | X | | | +| Qt Quick Designer (Qt Creator | X, R | X, R | X, R | | | | plugin) | | | | | | +-----------------------------------------------------------------------+ -| Qt Linguist | X | X | X | | | +| Qt Linguist | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Qt Assistant | X | X | X | | | +| Qt Assistant | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lupdate | X | X | X | | | +| Lupdate | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lrelease | X | X | X | | | +| Lrelease | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ | Qmake | X | X | | | | +-----------------------------------------------------------------------+ @@ -1142,7 +1143,8 @@ invoice. The Modules and/or Tools of the Licensed Software that are included with each -Add-On Product respectively are marked with 'X' in the below table. +Add-On Product respectively are marked with 'X' in the below table. The modules +are ported to Qt 6 in stages and are subject to availability. Parts of the respective Add-On Product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below @@ -1311,4 +1313,3 @@ Except for the modifications specified above, this Appendix carries no change to the terms of the Agreement which shall remain in full force. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT new/qtsvg-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT --- old/qtsvg-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2020-12-05 08:01:41.682986300 +0100 +++ new/qtsvg-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2021-02-25 06:44:11.754212600 +0100 @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.2.3 +Agreement version 4.3 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -159,14 +159,8 @@ "Party" or "Parties" shall mean Licensee and/or The Qt Company. -"Permitted Software" shall mean any (i) open source software (excluding Open -Source Qt) that is a) generally available for public in source code form -without additional cost under any of the licenses approved by Open Source -Initiative as listed on https://opensource.org/licenses; and (b) is in no -way, directly or indirectly, developed by or for or otherwise related to or -in the interest of the Licensee or its Affiliates, or (ii) software The Qt -Company has made available via its Qt Marketplace online distribution -channel. +"Permitted Combination" shall have the meaning as set forth in Section +3.4(viii). "Pre-Release Code" shall have the meaning as set forth in Section 4. @@ -308,10 +302,10 @@ Upon expiry of the initially agreed License Term, the respective License Terms shall be automatically extended to one or more Renewal Term(s), unless and -until either Party notifies the other Party in writing that it does not wish -to continue the License Term, such notification to be provided to the other -Party no less than thirty (30) days before expiry of the respective License -Term. +until either Party notifies the other Party in writing, or any other method +acceptable to The Qt Company, that it does not wish to continue the License +Term, such notification to be provided to the other Party no less than thirty +(30) days before expiry of the respective License Term. Unless otherwise agreed between the Parties, Renewal Term shall be of equal length with the initial License Term. @@ -323,8 +317,10 @@ Any price or other term specified for a Renewal Term shall be valid only for the specified time. -The Qt Company may request the Licensee to place a purchase order corresponding -to a quote by The Qt Company for the relevant Renewal Term. +The Qt Company may either request the Licensee to place a purchase order +corresponding to a quote by The Qt Company, or uses Licensees stored Credit +Card information in the QtAccount to automatically charge the Licensee for the +relevant Renewal Term. In the event Licensee does not prevent auto-renewal pursuant the above, but a Renewal Term is nevertheless not duly ordered within 30 days from the date of @@ -750,11 +746,13 @@ Notwithstanding the above, in the event the Agreement expires or is terminated: (i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses - possessed by the Licensee at such date shall be extended to be valid - in perpetuity under the terms of this Agreement and Licensee is - entitled to purchase additional licenses as set forth in - Section 10.2; or + License(s) as set forth in Section 3.1, and where such decision of + non-renewal is not due to any ongoing breach or alleged breach (as + reasonably determined by The Qt Company) by Licensee of the terms of this + Agreement or any applicable license terms of Open Source Qt, then all valid + licenses possessed by the Licensee at such date shall be extended to be + valid in perpetuity under the terms of this Agreement and Licensee is + entitled to purchase additional licenses as set forth in Section 10.2; or (ii) for reason other than by The Qt Company pursuant to item (i) above or pursuant to Section 12.2, then the Licensee is entitled, for a period of six (6) months after the effective date of termination, @@ -950,7 +948,8 @@ The modules and/or tools that are included in the respective product - Qt for Application Development (QtAD), Qt for Device Creation (QtDC), Qt for MCUs (QtMCU), Qt 3D Studio (Qt3DS) and Qt Design Studio (QtDS) - are -marked with 'X' in the below table. +marked with 'X' in the below table. The modules and tools are ported to Qt 6 +in stages and are subject to availability. Parts of the product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below table. @@ -968,6 +967,8 @@ +-----------------------------------------------------------------------+ | Qt Network | X, R | X, R | | | | +-----------------------------------------------------------------------+ +| Qt PDF | X, R | X, R | | | | ++-----------------------------------------------------------------------+ | Qt QML | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Quick | X, R | X, R | | | | @@ -1066,7 +1067,7 @@ +-----------------------------------------------------------------------+ | Qt Charts | X, R | X, R | | | | +-----------------------------------------------------------------------+ -| Qt Data visualization | X, R | X, R | | | | +| Qt Data Visualization | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Virtual Keyboard | X, R | X, R | | | | +-----------------------------------------------------------------------+ @@ -1086,16 +1087,16 @@ +-----------------------------------------------------------------------+ | Qt Designer (Qt Widget Designer) | X | X | | | | +-----------------------------------------------------------------------+ -| Qt Quick Designer (Qt Creator | X | X | X | | | +| Qt Quick Designer (Qt Creator | X, R | X, R | X, R | | | | plugin) | | | | | | +-----------------------------------------------------------------------+ -| Qt Linguist | X | X | X | | | +| Qt Linguist | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Qt Assistant | X | X | X | | | +| Qt Assistant | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lupdate | X | X | X | | | +| Lupdate | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lrelease | X | X | X | | | +| Lrelease | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ | Qmake | X | X | | | | +-----------------------------------------------------------------------+ @@ -1142,7 +1143,8 @@ invoice. The Modules and/or Tools of the Licensed Software that are included with each -Add-On Product respectively are marked with 'X' in the below table. +Add-On Product respectively are marked with 'X' in the below table. The modules +are ported to Qt 6 in stages and are subject to availability. Parts of the respective Add-On Product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below @@ -1311,4 +1313,3 @@ Except for the modifications specified above, this Appendix carries no change to the terms of the Agreement which shall remain in full force. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT new/qtsvg-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT --- old/qtsvg-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2020-12-05 08:01:41.682986300 +0100 +++ new/qtsvg-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2021-02-25 06:44:11.754212600 +0100 @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.2.3 +Agreement version 4.3 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -159,14 +159,8 @@ "Party" or "Parties" shall mean Licensee and/or The Qt Company. -"Permitted Software" shall mean any (i) open source software (excluding Open -Source Qt) that is a) generally available for public in source code form -without additional cost under any of the licenses approved by Open Source -Initiative as listed on https://opensource.org/licenses; and (b) is in no -way, directly or indirectly, developed by or for or otherwise related to or -in the interest of the Licensee or its Affiliates, or (ii) software The Qt -Company has made available via its Qt Marketplace online distribution -channel. +"Permitted Combination" shall have the meaning as set forth in Section +3.4(viii). "Pre-Release Code" shall have the meaning as set forth in Section 4. @@ -308,10 +302,10 @@ Upon expiry of the initially agreed License Term, the respective License Terms shall be automatically extended to one or more Renewal Term(s), unless and -until either Party notifies the other Party in writing that it does not wish -to continue the License Term, such notification to be provided to the other -Party no less than thirty (30) days before expiry of the respective License -Term. +until either Party notifies the other Party in writing, or any other method +acceptable to The Qt Company, that it does not wish to continue the License +Term, such notification to be provided to the other Party no less than thirty +(30) days before expiry of the respective License Term. Unless otherwise agreed between the Parties, Renewal Term shall be of equal length with the initial License Term. @@ -323,8 +317,10 @@ Any price or other term specified for a Renewal Term shall be valid only for the specified time. -The Qt Company may request the Licensee to place a purchase order corresponding -to a quote by The Qt Company for the relevant Renewal Term. +The Qt Company may either request the Licensee to place a purchase order +corresponding to a quote by The Qt Company, or uses Licensees stored Credit +Card information in the QtAccount to automatically charge the Licensee for the +relevant Renewal Term. In the event Licensee does not prevent auto-renewal pursuant the above, but a Renewal Term is nevertheless not duly ordered within 30 days from the date of @@ -750,11 +746,13 @@ Notwithstanding the above, in the event the Agreement expires or is terminated: (i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses - possessed by the Licensee at such date shall be extended to be valid - in perpetuity under the terms of this Agreement and Licensee is - entitled to purchase additional licenses as set forth in - Section 10.2; or + License(s) as set forth in Section 3.1, and where such decision of + non-renewal is not due to any ongoing breach or alleged breach (as + reasonably determined by The Qt Company) by Licensee of the terms of this + Agreement or any applicable license terms of Open Source Qt, then all valid + licenses possessed by the Licensee at such date shall be extended to be + valid in perpetuity under the terms of this Agreement and Licensee is + entitled to purchase additional licenses as set forth in Section 10.2; or (ii) for reason other than by The Qt Company pursuant to item (i) above or pursuant to Section 12.2, then the Licensee is entitled, for a period of six (6) months after the effective date of termination, @@ -950,7 +948,8 @@ The modules and/or tools that are included in the respective product - Qt for Application Development (QtAD), Qt for Device Creation (QtDC), Qt for MCUs (QtMCU), Qt 3D Studio (Qt3DS) and Qt Design Studio (QtDS) - are -marked with 'X' in the below table. +marked with 'X' in the below table. The modules and tools are ported to Qt 6 +in stages and are subject to availability. Parts of the product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below table. @@ -968,6 +967,8 @@ +-----------------------------------------------------------------------+ | Qt Network | X, R | X, R | | | | +-----------------------------------------------------------------------+ +| Qt PDF | X, R | X, R | | | | ++-----------------------------------------------------------------------+ | Qt QML | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Quick | X, R | X, R | | | | @@ -1066,7 +1067,7 @@ +-----------------------------------------------------------------------+ | Qt Charts | X, R | X, R | | | | +-----------------------------------------------------------------------+ -| Qt Data visualization | X, R | X, R | | | | +| Qt Data Visualization | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Virtual Keyboard | X, R | X, R | | | | +-----------------------------------------------------------------------+ @@ -1086,16 +1087,16 @@ +-----------------------------------------------------------------------+ | Qt Designer (Qt Widget Designer) | X | X | | | | +-----------------------------------------------------------------------+ -| Qt Quick Designer (Qt Creator | X | X | X | | | +| Qt Quick Designer (Qt Creator | X, R | X, R | X, R | | | | plugin) | | | | | | +-----------------------------------------------------------------------+ -| Qt Linguist | X | X | X | | | +| Qt Linguist | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Qt Assistant | X | X | X | | | +| Qt Assistant | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lupdate | X | X | X | | | +| Lupdate | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lrelease | X | X | X | | | +| Lrelease | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ | Qmake | X | X | | | | +-----------------------------------------------------------------------+ @@ -1142,7 +1143,8 @@ invoice. The Modules and/or Tools of the Licensed Software that are included with each -Add-On Product respectively are marked with 'X' in the below table. +Add-On Product respectively are marked with 'X' in the below table. The modules +are ported to Qt 6 in stages and are subject to availability. Parts of the respective Add-On Product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below @@ -1311,4 +1313,3 @@ Except for the modifications specified above, this Appendix carries no change to the terms of the Agreement which shall remain in full force. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT new/qtsvg-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT --- old/qtsvg-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2020-12-05 08:01:41.682986300 +0100 +++ new/qtsvg-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2021-02-25 06:44:11.754212600 +0100 @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.2.3 +Agreement version 4.3 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -159,14 +159,8 @@ "Party" or "Parties" shall mean Licensee and/or The Qt Company. -"Permitted Software" shall mean any (i) open source software (excluding Open -Source Qt) that is a) generally available for public in source code form -without additional cost under any of the licenses approved by Open Source -Initiative as listed on https://opensource.org/licenses; and (b) is in no -way, directly or indirectly, developed by or for or otherwise related to or -in the interest of the Licensee or its Affiliates, or (ii) software The Qt -Company has made available via its Qt Marketplace online distribution -channel. +"Permitted Combination" shall have the meaning as set forth in Section +3.4(viii). "Pre-Release Code" shall have the meaning as set forth in Section 4. @@ -308,10 +302,10 @@ Upon expiry of the initially agreed License Term, the respective License Terms shall be automatically extended to one or more Renewal Term(s), unless and -until either Party notifies the other Party in writing that it does not wish -to continue the License Term, such notification to be provided to the other -Party no less than thirty (30) days before expiry of the respective License -Term. +until either Party notifies the other Party in writing, or any other method +acceptable to The Qt Company, that it does not wish to continue the License +Term, such notification to be provided to the other Party no less than thirty +(30) days before expiry of the respective License Term. Unless otherwise agreed between the Parties, Renewal Term shall be of equal length with the initial License Term. @@ -323,8 +317,10 @@ Any price or other term specified for a Renewal Term shall be valid only for the specified time. -The Qt Company may request the Licensee to place a purchase order corresponding -to a quote by The Qt Company for the relevant Renewal Term. +The Qt Company may either request the Licensee to place a purchase order +corresponding to a quote by The Qt Company, or uses Licensees stored Credit +Card information in the QtAccount to automatically charge the Licensee for the +relevant Renewal Term. In the event Licensee does not prevent auto-renewal pursuant the above, but a Renewal Term is nevertheless not duly ordered within 30 days from the date of @@ -750,11 +746,13 @@ Notwithstanding the above, in the event the Agreement expires or is terminated: (i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses - possessed by the Licensee at such date shall be extended to be valid - in perpetuity under the terms of this Agreement and Licensee is - entitled to purchase additional licenses as set forth in - Section 10.2; or + License(s) as set forth in Section 3.1, and where such decision of + non-renewal is not due to any ongoing breach or alleged breach (as + reasonably determined by The Qt Company) by Licensee of the terms of this + Agreement or any applicable license terms of Open Source Qt, then all valid + licenses possessed by the Licensee at such date shall be extended to be + valid in perpetuity under the terms of this Agreement and Licensee is + entitled to purchase additional licenses as set forth in Section 10.2; or (ii) for reason other than by The Qt Company pursuant to item (i) above or pursuant to Section 12.2, then the Licensee is entitled, for a period of six (6) months after the effective date of termination, @@ -950,7 +948,8 @@ The modules and/or tools that are included in the respective product - Qt for Application Development (QtAD), Qt for Device Creation (QtDC), Qt for MCUs (QtMCU), Qt 3D Studio (Qt3DS) and Qt Design Studio (QtDS) - are -marked with 'X' in the below table. +marked with 'X' in the below table. The modules and tools are ported to Qt 6 +in stages and are subject to availability. Parts of the product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below table. @@ -968,6 +967,8 @@ +-----------------------------------------------------------------------+ | Qt Network | X, R | X, R | | | | +-----------------------------------------------------------------------+ +| Qt PDF | X, R | X, R | | | | ++-----------------------------------------------------------------------+ | Qt QML | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Quick | X, R | X, R | | | | @@ -1066,7 +1067,7 @@ +-----------------------------------------------------------------------+ | Qt Charts | X, R | X, R | | | | +-----------------------------------------------------------------------+ -| Qt Data visualization | X, R | X, R | | | | +| Qt Data Visualization | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Virtual Keyboard | X, R | X, R | | | | +-----------------------------------------------------------------------+ @@ -1086,16 +1087,16 @@ +-----------------------------------------------------------------------+ | Qt Designer (Qt Widget Designer) | X | X | | | | +-----------------------------------------------------------------------+ -| Qt Quick Designer (Qt Creator | X | X | X | | | +| Qt Quick Designer (Qt Creator | X, R | X, R | X, R | | | | plugin) | | | | | | +-----------------------------------------------------------------------+ -| Qt Linguist | X | X | X | | | +| Qt Linguist | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Qt Assistant | X | X | X | | | +| Qt Assistant | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lupdate | X | X | X | | | +| Lupdate | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lrelease | X | X | X | | | +| Lrelease | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ | Qmake | X | X | | | | +-----------------------------------------------------------------------+ @@ -1142,7 +1143,8 @@ invoice. The Modules and/or Tools of the Licensed Software that are included with each -Add-On Product respectively are marked with 'X' in the below table. +Add-On Product respectively are marked with 'X' in the below table. The modules +are ported to Qt 6 in stages and are subject to availability. Parts of the respective Add-On Product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below @@ -1311,4 +1313,3 @@ Except for the modifications specified above, this Appendix carries no change to the terms of the Agreement which shall remain in full force. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/.cmake.conf new/qtsvg-everywhere-src-6.0.2/.cmake.conf --- old/qtsvg-everywhere-src-6.0.0/.cmake.conf 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/.cmake.conf 2021-02-25 00:54:26.000000000 +0100 @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.0.0") +set(QT_REPO_MODULE_VERSION "6.0.2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/.qmake.conf new/qtsvg-everywhere-src-6.0.2/.qmake.conf --- old/qtsvg-everywhere-src-6.0.0/.qmake.conf 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/.qmake.conf 2021-02-25 00:54:26.000000000 +0100 @@ -3,4 +3,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.0.0 +MODULE_VERSION = 6.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/.tag new/qtsvg-everywhere-src-6.0.2/.tag --- old/qtsvg-everywhere-src-6.0.0/.tag 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/.tag 2021-02-25 00:54:26.000000000 +0100 @@ -1 +1 @@ -608054063bf58c555a1871e0a4df9c329c3b6885 +af7b4e8d7d0836b778bcafba6d34ea36c43a010d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/dependencies.yaml new/qtsvg-everywhere-src-6.0.2/dependencies.yaml --- old/qtsvg-everywhere-src-6.0.0/dependencies.yaml 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/dependencies.yaml 2021-02-25 00:54:26.000000000 +0100 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: fc9cda5f08ac848e88f63dd4a07c08b2fbc6bf17 + ref: 723077eb3529810aa3b99d8c06f9b81a586763c9 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgfont_p.h 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/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.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvggraphics_p.h 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/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.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvghandler_p.h 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/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.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgnode_p.h 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/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.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgstructure_p.h 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/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.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgstyle_p.h 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/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.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.0/QtSvg/private/qsvgtinydocument_p.h 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/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.0.0/include/QtSvg/6.0.0/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.0/QtSvg/private/qtsvgglobal_p.h 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.0/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.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgfont_p.h 2021-02-25 00:54:26.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfont_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvggraphics_p.h 2021-02-25 00:54:26.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvggraphics_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvghandler_p.h 2021-02-25 00:54:26.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvghandler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgnode_p.h 2021-02-25 00:54:26.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgstructure_p.h 2021-02-25 00:54:26.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstructure_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgstyle_p.h 2021-02-25 00:54:26.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstyle_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qsvgtinydocument_p.h 2021-02-25 00:54:26.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/6.0.2/QtSvg/private/qtsvgglobal_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/6.0.2/QtSvg/private/qtsvgglobal_p.h 2021-02-25 00:54:26.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qtsvgglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvg/qtsvgversion.h new/qtsvg-everywhere-src-6.0.2/include/QtSvg/qtsvgversion.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvg/qtsvgversion.h 2020-12-05 08:01:41.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvg/qtsvgversion.h 2021-02-25 06:44:11.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTSVG_VERSION_H #define QT_QTSVG_VERSION_H -#define QTSVG_VERSION_STR "6.0.0" +#define QTSVG_VERSION_STR "6.0.2" -#define QTSVG_VERSION 0x060000 +#define QTSVG_VERSION 0x060002 #endif // QT_QTSVG_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/include/QtSvgWidgets/qtsvgwidgetsversion.h new/qtsvg-everywhere-src-6.0.2/include/QtSvgWidgets/qtsvgwidgetsversion.h --- old/qtsvg-everywhere-src-6.0.0/include/QtSvgWidgets/qtsvgwidgetsversion.h 2020-12-05 08:01:41.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/include/QtSvgWidgets/qtsvgwidgetsversion.h 2021-02-25 06:44:11.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTSVGWIDGETS_VERSION_H #define QT_QTSVGWIDGETS_VERSION_H -#define QTSVGWIDGETS_VERSION_STR "6.0.0" +#define QTSVGWIDGETS_VERSION_STR "6.0.2" -#define QTSVGWIDGETS_VERSION 0x060000 +#define QTSVGWIDGETS_VERSION 0x060002 #endif // QT_QTSVGWIDGETS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/src/svg/qsvghandler.cpp new/qtsvg-everywhere-src-6.0.2/src/svg/qsvghandler.cpp --- old/qtsvg-everywhere-src-6.0.0/src/svg/qsvghandler.cpp 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/src/svg/qsvghandler.cpp 2021-02-25 00:54:26.000000000 +0100 @@ -65,6 +65,7 @@ #include "private/qmath_p.h" #include "float.h" +#include <cmath> QT_BEGIN_NAMESPACE @@ -679,6 +680,8 @@ val = -val; } else { val = QByteArray::fromRawData(temp, pos).toDouble(); + if (qFpClassify(val) != FP_NORMAL) + val = 0; } return val; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/src/svg/qsvgstructure.cpp new/qtsvg-everywhere-src-6.0.2/src/svg/qsvgstructure.cpp --- old/qtsvg-everywhere-src-6.0.0/src/svg/qsvgstructure.cpp 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/src/svg/qsvgstructure.cpp 2021-02-25 00:54:26.000000000 +0100 @@ -255,9 +255,13 @@ }; if (str.length() <= MAX_WORD_LENGTH && str.length() >= MIN_WORD_LENGTH) { + const char16_t unicode44 = str.at(44).unicode(); + const char16_t unicode45 = str.at(45).unicode(); + if (unicode44 >= sizeof(asso_values) || unicode45 >= sizeof(asso_values)) + return false; const int key = str.length() - + asso_values[str.at(45).unicode()] - + asso_values[str.at(44).unicode()]; + + asso_values[unicode45] + + asso_values[unicode44]; if (key <= MAX_HASH_VALUE && key >= 0) return str == QLatin1String(wordlist[key]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/src/svg/qsvgstyle.cpp new/qtsvg-everywhere-src-6.0.2/src/svg/qsvgstyle.cpp --- old/qtsvg-everywhere-src-6.0.0/src/svg/qsvgstyle.cpp 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/src/svg/qsvgstyle.cpp 2021-02-25 00:54:26.000000000 +0100 @@ -263,7 +263,9 @@ } else { states.fontWeight = m_weight; } - font.setWeight(QFont::Weight(states.fontWeight)); + font.setWeight(QFont::Weight(qBound(static_cast<int>(QFont::Weight::Thin), + states.fontWeight, + static_cast<int>(QFont::Weight::Black)))); } p->setFont(font); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.0.0/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp new/qtsvg-everywhere-src-6.0.2/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp --- old/qtsvg-everywhere-src-6.0.0/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp 2020-12-04 16:35:27.000000000 +0100 +++ new/qtsvg-everywhere-src-6.0.2/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp 2021-02-25 00:54:26.000000000 +0100 @@ -523,14 +523,17 @@ + m.m33() * m.m33()); } -static bool diffIsSmallEnough(double diff, double norm) +template<typename T> +static inline bool diffIsSmallEnough(T diff, T norm) { - return diff <= 1e-12 * norm; -} - -static inline bool diffIsSmallEnough(float diff, float norm) -{ - return diff <= 1e-5 * norm; + static_assert(std::is_same_v<T, double> || std::is_same_v<T, float>); + T sigma = []{ + if constexpr (std::is_same_v<T, double>) + return 1e-12; + else + return 1e-5; + }(); + return diff <= sigma * norm; } static void compareTransforms(const QTransform &m1, const QTransform &m2)
