Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-qt5compat for openSUSE:Factory checked in at 2021-03-17 20:14:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-qt5compat (Old) and /work/SRC/openSUSE:Factory/.qt6-qt5compat.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-qt5compat" Wed Mar 17 20:14:30 2021 rev:2 rq:878002 version:6.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-qt5compat/qt6-qt5compat.changes 2020-12-18 19:58:52.378029424 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-qt5compat.new.2401/qt6-qt5compat.changes 2021-03-17 20:17:55.331150811 +0100 @@ -1,0 +2,12 @@ +Fri Mar 5 09:31:24 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.0.2: + https://www.qt.io/blog/qt-6.0.2-released + +------------------------------------------------------------------- +Wed Feb 3 17:19:31 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.0.1 + https://www.qt.io/blog/qt-6.0.1-released + +------------------------------------------------------------------- Old: ---- qt5compat-everywhere-src-6.0.0.tar.xz New: ---- qt5compat-everywhere-src-6.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-qt5compat.spec ++++++ --- /var/tmp/diff_new_pack.NF2VLs/_old 2021-03-17 20:17:55.819151478 +0100 +++ /var/tmp/diff_new_pack.NF2VLs/_new 2021-03-17 20:17:55.823151483 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt6-qt5compat # -# 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 qt5compat-everywhere-src %define tar_suffix %{nil} @@ -27,9 +27,9 @@ %endif # Name: qt6-qt5compat%{?pkg_suffix} -Version: 6.0.0 +Version: 6.0.2 Release: 0 -Summary: Qt 6 Qt5 Compat +Summary: Unsupported Qt 5 APIs for Qt 6 License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz @@ -46,7 +46,8 @@ %endif %description -The Qt 6 Compat library to help porting Qt 5 code +The Qt 6 Compat library provides unsupported Qt 5 APIs which can be useful +while porting Qt 5 code. %if !%{qt6_docs_flavor} ++++++ qt5compat-everywhere-src-6.0.0.tar.xz -> qt5compat-everywhere-src-6.0.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT new/qt5compat-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT --- old/qt5compat-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT 2020-12-05 08:01:42.050986300 +0100 +++ new/qt5compat-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT 2021-02-25 06:44:12.110212300 +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/qt5compat-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT new/qt5compat-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT --- old/qt5compat-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2020-12-05 08:01:42.046986000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2021-02-25 06:44:12.110212300 +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/qt5compat-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT new/qt5compat-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT --- old/qt5compat-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2020-12-05 08:01:42.046986000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2021-02-25 06:44:12.110212300 +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/qt5compat-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT new/qt5compat-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT --- old/qt5compat-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2020-12-05 08:01:42.046986000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2021-02-25 06:44:12.110212300 +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/qt5compat-everywhere-src-6.0.0/.cmake.conf new/qt5compat-everywhere-src-6.0.2/.cmake.conf --- old/qt5compat-everywhere-src-6.0.0/.cmake.conf 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/.cmake.conf 2021-02-25 00:54:29.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/qt5compat-everywhere-src-6.0.0/.qmake.conf new/qt5compat-everywhere-src-6.0.2/.qmake.conf --- old/qt5compat-everywhere-src-6.0.0/.qmake.conf 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/.qmake.conf 2021-02-25 00:54:29.000000000 +0100 @@ -2,4 +2,4 @@ DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.0.0 +MODULE_VERSION = 6.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/.tag new/qt5compat-everywhere-src-6.0.2/.tag --- old/qt5compat-everywhere-src-6.0.0/.tag 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/.tag 2021-02-25 00:54:29.000000000 +0100 @@ -1 +1 @@ -46fd0963a547b7907f732324fd822abca3fec8d7 +739d144cba52bdba738c14de41c45659bddf8ab1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/dependencies.yaml new/qt5compat-everywhere-src-6.0.2/dependencies.yaml --- old/qt5compat-everywhere-src-6.0.0/dependencies.yaml 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/dependencies.yaml 2021-02-25 00:54:29.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/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/cp949codetbl_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/cp949codetbl_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/cp949codetbl_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/cp949codetbl_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/cp949codetbl_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbig5codec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbig5codec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbig5codec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbig5codec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qbig5codec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjson_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjson_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjson_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjson_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/serialization/qbinaryjson_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonarray_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonarray_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonarray_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonarray_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/serialization/qbinaryjsonarray_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonobject_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonobject_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonobject_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonobject_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/serialization/qbinaryjsonobject_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonvalue_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonvalue_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonvalue_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qbinaryjsonvalue_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/serialization/qbinaryjsonvalue_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qeucjpcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qeucjpcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qeucjpcodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qeucjpcodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qeucjpcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qeuckrcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qeuckrcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qeuckrcodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qeuckrcodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qeuckrcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qgb18030codec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qgb18030codec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qgb18030codec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qgb18030codec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qgb18030codec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qiconvcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qiconvcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qiconvcodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qiconvcodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qiconvcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qicucodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qicucodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qicucodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qicucodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qicucodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qisciicodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qisciicodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qisciicodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qisciicodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qisciicodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qjiscodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qjiscodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qjiscodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qjiscodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qjiscodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qjpunicode_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qjpunicode_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qjpunicode_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qjpunicode_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qjpunicode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qlatincodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qlatincodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qlatincodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qlatincodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qlatincodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qsimplecodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qsimplecodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qsimplecodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qsimplecodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qsimplecodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qsjiscodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qsjiscodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qsjiscodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qsjiscodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qsjiscodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qtextcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qtextcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qtextcodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qtextcodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qtextcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qtsciicodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qtsciicodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qtsciicodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qtsciicodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qtsciicodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qutfcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qutfcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qutfcodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qutfcodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qutfcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qwindowscodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qwindowscodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qwindowscodec_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qwindowscodec_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/codecs/qwindowscodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qxml_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qxml_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qxml_p.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.0/QtCore5Compat/private/qxml_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/core5/sax/qxml_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/cp949codetbl_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/cp949codetbl_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/cp949codetbl_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/cp949codetbl_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/cp949codetbl_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbig5codec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbig5codec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbig5codec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbig5codec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qbig5codec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjson_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjson_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjson_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjson_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/serialization/qbinaryjson_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonarray_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonarray_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonarray_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonarray_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/serialization/qbinaryjsonarray_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonobject_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonobject_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonobject_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonobject_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/serialization/qbinaryjsonobject_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonvalue_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonvalue_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonvalue_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qbinaryjsonvalue_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/serialization/qbinaryjsonvalue_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qeucjpcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qeucjpcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qeucjpcodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qeucjpcodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qeucjpcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qeuckrcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qeuckrcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qeuckrcodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qeuckrcodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qeuckrcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qgb18030codec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qgb18030codec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qgb18030codec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qgb18030codec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qgb18030codec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qiconvcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qiconvcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qiconvcodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qiconvcodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qiconvcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qicucodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qicucodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qicucodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qicucodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qicucodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qisciicodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qisciicodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qisciicodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qisciicodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qisciicodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qjiscodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qjiscodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qjiscodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qjiscodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qjiscodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qjpunicode_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qjpunicode_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qjpunicode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qjpunicode_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qjpunicode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qlatincodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qlatincodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qlatincodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qlatincodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qlatincodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qsimplecodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qsimplecodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qsimplecodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qsimplecodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qsimplecodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qsjiscodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qsjiscodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qsjiscodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qsjiscodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qsjiscodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qtextcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qtextcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qtextcodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qtextcodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qtextcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qtsciicodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qtsciicodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qtsciicodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qtsciicodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qtsciicodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qutfcodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qutfcodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qutfcodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qutfcodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qutfcodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qwindowscodec_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qwindowscodec_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qwindowscodec_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qwindowscodec_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/codecs/qwindowscodec_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qxml_p.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qxml_p.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qxml_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/6.0.2/QtCore5Compat/private/qxml_p.h 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/core5/sax/qxml_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/qtcore5compatversion.h new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/qtcore5compatversion.h --- old/qt5compat-everywhere-src-6.0.0/include/QtCore5Compat/qtcore5compatversion.h 2020-12-05 08:01:41.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/include/QtCore5Compat/qtcore5compatversion.h 2021-02-25 06:44:11.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTCORE5COMPAT_VERSION_H #define QT_QTCORE5COMPAT_VERSION_H -#define QTCORE5COMPAT_VERSION_STR "6.0.0" +#define QTCORE5COMPAT_VERSION_STR "6.0.2" -#define QTCORE5COMPAT_VERSION 0x060000 +#define QTCORE5COMPAT_VERSION 0x060002 #endif // QT_QTCORE5COMPAT_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/CMakeLists.txt new/qt5compat-everywhere-src-6.0.2/src/core5/CMakeLists.txt --- old/qt5compat-everywhere-src-6.0.0/src/core5/CMakeLists.txt 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/CMakeLists.txt 2021-02-25 00:54:29.000000000 +0100 @@ -78,6 +78,6 @@ codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h ) qt_internal_add_docs(Core5Compat - doc/qtcore5.qdocconf + doc/qtcore5compat.qdocconf ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qisciicodec.cpp new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qisciicodec.cpp --- old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qisciicodec.cpp 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qisciicodec.cpp 2021-02-25 00:54:29.000000000 +0100 @@ -70,11 +70,14 @@ QTextCodec *QIsciiCodec::create(const char *name) { + QIsciiCodec *codec = nullptr; for (int i = 0; i < 9; ++i) { - if (qTextCodecNameMatch(name, codecs[i].name)) - return new QIsciiCodec(i); + if (qTextCodecNameMatch(name, codecs[i].name)) { + codec = new QIsciiCodec(i); + break; + } } - return nullptr; + return codec; } QIsciiCodec::~QIsciiCodec() @@ -267,11 +270,11 @@ *uc++ = ch; else { ushort c = iscii_to_uni_table[ch - 0xa0]; - if (halant && (c == inv || c == 0xe9)) { + if (halant && (ch == inv || ch == 0xe9)) { // Consonant Halant inv -> Consonant Halant ZWJ // Consonant Halant Nukta -> Consonant Halant ZWJ *uc++ = QChar(0x200d); - } else if (halant && c == 0xe8) { + } else if (halant && ch == 0xe8) { // Consonant Halant Halant -> Consonant Halant ZWNJ *uc++ = QChar(0x200c); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qlatincodec.cpp new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qlatincodec.cpp --- old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qlatincodec.cpp 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qlatincodec.cpp 2021-02-25 00:54:29.000000000 +0100 @@ -48,9 +48,6 @@ QString QLatin1Codec::convertToUnicode(const char *chars, int len, ConverterState *) const { - if (chars == nullptr) - return QString(); - return QString::fromLatin1(chars, len); } @@ -104,9 +101,6 @@ QString QLatin15Codec::convertToUnicode(const char* chars, int len, ConverterState *) const { - if (chars == nullptr) - return QString(); - QString str = QString::fromLatin1(chars, len); QChar *uc = str.data(); while(len--) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qsimplecodec.cpp new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qsimplecodec.cpp --- old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qsimplecodec.cpp 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qsimplecodec.cpp 2021-02-25 00:54:29.000000000 +0100 @@ -640,9 +640,6 @@ QString QSimpleTextCodec::convertToUnicode(const char* chars, int len, ConverterState *) const { - if (len <= 0 || chars == nullptr) - return QString(); - const unsigned char * c = (const unsigned char *)chars; QString r(len, QT_PREPEND_NAMESPACE(Qt::Uninitialized)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qt_attribution.json new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qt_attribution.json --- old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qt_attribution.json 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qt_attribution.json 2021-02-25 00:54:29.000000000 +0100 @@ -2,7 +2,7 @@ { "Id": "qbig5codecs", "Name": "Text Codecs: Big5, Big5-HKSCS", - "QDocModule": "qtcore5", + "QDocModule": "qtcore5compat", "QtUsage": "Used in Qt Core if ICU is not used. Configure with -icu to avoid.", "Path": "qbig5codec.cpp", @@ -16,7 +16,7 @@ { "Id": "qeucjpcodec", "Name": "Text Codec: EUC-JP", - "QDocModule": "qtcore5", + "QDocModule": "qtcore5compat", "QtUsage": "Used in Qt Core if ICU is not used. Configure with -icu to avoid.", "Path": "qeucjpcodec.cpp", @@ -30,7 +30,7 @@ { "Id": "qeuckrcodec", "Name": "Text Codec: EUC-KR", - "QDocModule": "qtcore5", + "QDocModule": "qtcore5compat", "QtUsage": "Used in Qt Core if ICU is not used. Configure with -icu to avoid.", "Path": "qeuckrcodec.cpp", @@ -44,7 +44,7 @@ { "Id": "qjiscodec", "Name": "Text Codec: ISO 2022-JP (JIS)", - "QDocModule": "qtcore5", + "QDocModule": "qtcore5compat", "QtUsage": "Used in Qt Core if ICU is not used. Configure with -icu to avoid.", "Path": "qjiscodec.cpp", @@ -58,7 +58,7 @@ { "Id": "qsjiscodec", "Name": "Text Codec: Shift-JIS", - "QDocModule": "qtcore5", + "QDocModule": "qtcore5compat", "QtUsage": "Used in Qt Core if ICU is not used. Configure with -icu to avoid.", "Path": "qsjiscodec.cpp", @@ -72,7 +72,7 @@ { "Id": "qtsciicodec", "Name": "Text Codec: TSCII", - "QDocModule": "qtcore5", + "QDocModule": "qtcore5compat", "QtUsage": "Used in Qt Core.", "Path": "qtsciicodec.cpp", @@ -86,7 +86,7 @@ { "Id": "qbkcodec", "Name": "Text Codec: GBK", - "QDocModule": "qtcore5", + "QDocModule": "qtcore5compat", "QtUsage": "Used in Qt Core if ICU is not used. Configure with -icu to avoid.", "Path": "qgb18030codec.cpp", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qtextcodec.cpp new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qtextcodec.cpp --- old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qtextcodec.cpp 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qtextcodec.cpp 2021-02-25 00:54:29.000000000 +0100 @@ -920,7 +920,7 @@ */ QString QTextCodec::toUnicode(const char *chars) const { - int len = qstrlen(chars); + const auto len = int(qstrlen(chars)); return convertToUnicode(chars, len, nullptr); } @@ -1115,14 +1115,14 @@ if (!c) { static Q_RELAXED_CONSTEXPR auto matcher = qMakeStaticByteArrayMatcher("meta "); QByteArray header = ba.left(1024).toLower(); - int pos = matcher.indexIn(header); + qsizetype pos = matcher.indexIn(header); if (pos != -1) { static Q_RELAXED_CONSTEXPR auto matcher = qMakeStaticByteArrayMatcher("charset="); pos = matcher.indexIn(header, pos); if (pos != -1) { pos += qstrlen("charset="); - int pos2 = pos; + qsizetype pos2 = pos; // The attribute can be closed with either """, "'", ">" or "/", // none of which are valid charset characters. while (++pos2 < header.size()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qtextcodec.h new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qtextcodec.h --- old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qtextcodec.h 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qtextcodec.h 2021-02-25 00:54:29.000000000 +0100 @@ -95,9 +95,17 @@ QByteArray fromUnicode(QStringView uc) const; QString toUnicode(const char *in, int length, ConverterState *state = nullptr) const - { return convertToUnicode(in, length, state); } + { + if (in == nullptr || length <= 0) + return {}; + return convertToUnicode(in, length, state); + } QByteArray fromUnicode(const QChar *in, int length, ConverterState *state = nullptr) const - { return convertFromUnicode(in, length, state); } + { + if (in == nullptr || length <= 0) + return {}; + return convertFromUnicode(in, length, state); + } QTextDecoder* makeDecoder(ConversionFlags flags = DefaultConversion) const; QTextEncoder* makeEncoder(ConversionFlags flags = DefaultConversion) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qtsciicodec.cpp new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qtsciicodec.cpp --- old/qt5compat-everywhere-src-6.0.0/src/core5/codecs/qtsciicodec.cpp 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/codecs/qtsciicodec.cpp 2021-02-25 00:54:29.000000000 +0100 @@ -199,87 +199,87 @@ {0x0B93, 0x0000, 0x0000, 0xB5}, {0x0B94, 0x0000, 0x0000, 0xB6}, {0x0B95, 0x0000, 0x0000, 0xB8}, - {0x0B95, 0x0B82, 0x0000, 0xEC}, {0x0B95, 0x0BC1, 0x0000, 0xCC}, {0x0B95, 0x0BC2, 0x0000, 0xDC}, + {0x0B95, 0x0BCD, 0x0000, 0xEC}, {0x0B99, 0x0000, 0x0000, 0xB9}, - {0x0B99, 0x0B82, 0x0000, 0xED}, {0x0B99, 0x0BC1, 0x0000, 0x99}, {0x0B99, 0x0BC2, 0x0000, 0x9B}, + {0x0B99, 0x0BCD, 0x0000, 0xED}, {0x0B9A, 0x0000, 0x0000, 0xBA}, - {0x0B9A, 0x0B82, 0x0000, 0xEE}, {0x0B9A, 0x0BC1, 0x0000, 0xCD}, {0x0B9A, 0x0BC2, 0x0000, 0xDD}, + {0x0B9A, 0x0BCD, 0x0000, 0xEE}, {0x0B9C, 0x0000, 0x0000, 0x83}, - {0x0B9C, 0x0B82, 0x0000, 0x88}, + {0x0B9C, 0x0BCD, 0x0000, 0x88}, {0x0B9E, 0x0000, 0x0000, 0xBB}, - {0x0B9E, 0x0B82, 0x0000, 0xEF}, + {0x0B9E, 0x0BCD, 0x0000, 0xEF}, {0x0B9E, 0x0BC1, 0x0000, 0x9A}, {0x0B9E, 0x0BC2, 0x0000, 0x9C}, {0x0B9F, 0x0000, 0x0000, 0xBC}, - {0x0B9F, 0x0B82, 0x0000, 0xF0}, {0x0B9F, 0x0BBF, 0x0000, 0xCA}, {0x0B9F, 0x0BC0, 0x0000, 0xCB}, {0x0B9F, 0x0BC1, 0x0000, 0xCE}, {0x0B9F, 0x0BC2, 0x0000, 0xDE}, - {0x0BA1, 0x0B82, 0x0000, 0xF2}, + {0x0B9F, 0x0BCD, 0x0000, 0xF0}, {0x0BA3, 0x0000, 0x0000, 0xBD}, - {0x0BA3, 0x0B82, 0x0000, 0xF1}, + {0x0BA3, 0x0BCD, 0x0000, 0xF1}, {0x0BA3, 0x0BC1, 0x0000, 0xCF}, {0x0BA3, 0x0BC2, 0x0000, 0xDF}, {0x0BA4, 0x0000, 0x0000, 0xBE}, {0x0BA4, 0x0BC1, 0x0000, 0xD0}, {0x0BA4, 0x0BC2, 0x0000, 0xE0}, + {0x0BA4, 0x0BCD, 0x0000, 0xF2}, {0x0BA8, 0x0000, 0x0000, 0xBF}, - {0x0BA8, 0x0B82, 0x0000, 0xF3}, {0x0BA8, 0x0BC1, 0x0000, 0xD1}, {0x0BA8, 0x0BC2, 0x0000, 0xE1}, + {0x0BA8, 0x0BCD, 0x0000, 0xF3}, {0x0BA9, 0x0000, 0x0000, 0xC9}, - {0x0BA9, 0x0B82, 0x0000, 0xFD}, {0x0BA9, 0x0BC1, 0x0000, 0xDB}, {0x0BA9, 0x0BC2, 0x0000, 0xEB}, + {0x0BA9, 0x0BCD, 0x0000, 0xFD}, {0x0BAA, 0x0000, 0x0000, 0xC0}, - {0x0BAA, 0x0B82, 0x0000, 0xF4}, {0x0BAA, 0x0BC1, 0x0000, 0xD2}, {0x0BAA, 0x0BC2, 0x0000, 0xE2}, + {0x0BAA, 0x0BCD, 0x0000, 0xF4}, {0x0BAE, 0x0000, 0x0000, 0xC1}, - {0x0BAE, 0x0B82, 0x0000, 0xF5}, {0x0BAE, 0x0BC1, 0x0000, 0xD3}, {0x0BAE, 0x0BC2, 0x0000, 0xE3}, + {0x0BAE, 0x0BCD, 0x0000, 0xF5}, {0x0BAF, 0x0000, 0x0000, 0xC2}, - {0x0BAF, 0x0B82, 0x0000, 0xF6}, {0x0BAF, 0x0BC1, 0x0000, 0xD4}, {0x0BAF, 0x0BC2, 0x0000, 0xE4}, + {0x0BAF, 0x0BCD, 0x0000, 0xF6}, {0x0BB0, 0x0000, 0x0000, 0xC3}, - {0x0BB0, 0x0B82, 0x0000, 0xF7}, {0x0BB0, 0x0BC1, 0x0000, 0xD5}, {0x0BB0, 0x0BC2, 0x0000, 0xE5}, + {0x0BB0, 0x0BCD, 0x0000, 0xF7}, {0x0BB1, 0x0000, 0x0000, 0xC8}, - {0x0BB1, 0x0B82, 0x0000, 0xFC}, {0x0BB1, 0x0BC1, 0x0000, 0xDA}, {0x0BB1, 0x0BC2, 0x0000, 0xEA}, + {0x0BB1, 0x0BCD, 0x0000, 0xFC}, {0x0BB2, 0x0000, 0x0000, 0xC4}, - {0x0BB2, 0x0B82, 0x0000, 0xF8}, {0x0BB2, 0x0BC1, 0x0000, 0xD6}, {0x0BB2, 0x0BC2, 0x0000, 0xE6}, + {0x0BB2, 0x0BCD, 0x0000, 0xF8}, {0x0BB3, 0x0000, 0x0000, 0xC7}, - {0x0BB3, 0x0B82, 0x0000, 0xFB}, {0x0BB3, 0x0BC1, 0x0000, 0xD9}, {0x0BB3, 0x0BC2, 0x0000, 0xE9}, + {0x0BB3, 0x0BCD, 0x0000, 0xFB}, {0x0BB4, 0x0000, 0x0000, 0xC6}, - {0x0BB4, 0x0B82, 0x0000, 0xFA}, {0x0BB4, 0x0BC1, 0x0000, 0xD8}, {0x0BB4, 0x0BC2, 0x0000, 0xE8}, + {0x0BB4, 0x0BCD, 0x0000, 0xFA}, {0x0BB5, 0x0000, 0x0000, 0xC5}, - {0x0BB5, 0x0B82, 0x0000, 0xF9}, {0x0BB5, 0x0BC1, 0x0000, 0xD7}, {0x0BB5, 0x0BC2, 0x0000, 0xE7}, + {0x0BB5, 0x0BCD, 0x0000, 0xF9}, {0x0BB7, 0x0000, 0x0000, 0x84}, - {0x0BB7, 0x0B82, 0x0000, 0x89}, + {0x0BB7, 0x0BCD, 0x0000, 0x89}, {0x0BB8, 0x0000, 0x0000, 0x85}, - {0x0BB8, 0x0B82, 0x0000, 0x8A}, + {0x0BB8, 0x0BCD, 0x0000, 0x8A}, {0x0BB9, 0x0000, 0x0000, 0x86}, - {0x0BB9, 0x0B82, 0x0000, 0x8B}, + {0x0BB9, 0x0BCD, 0x0000, 0x8B}, {0x0BBE, 0x0000, 0x0000, 0xA1}, {0x0BBF, 0x0000, 0x0000, 0xA2}, {0x0BC0, 0x0000, 0x0000, 0xA3}, @@ -314,16 +314,16 @@ // Starting at 0x80 {0x0BE6, 0x0000, 0x0000}, {0x0BE7, 0x0000, 0x0000}, - {0x0000, 0x0000, 0x0000}, // unknown + {0x0000, 0x0000, 0x0000}, // not covered in the unicode document {0x0B9C, 0x0000, 0x0000}, {0x0BB7, 0x0000, 0x0000}, {0x0BB8, 0x0000, 0x0000}, {0x0BB9, 0x0000, 0x0000}, {0x0BE7, 0x0BB7, 0x0000}, - {0x0B9C, 0x0B82, 0x0000}, - {0x0BB7, 0x0B82, 0x0000}, - {0x0BB8, 0x0B82, 0x0000}, - {0x0BB9, 0x0B82, 0x0000}, + {0x0B9C, 0x0BCD, 0x0000}, + {0x0BB7, 0x0BCD, 0x0000}, + {0x0BB8, 0x0BCD, 0x0000}, + {0x0BB9, 0x0BCD, 0x0000}, {0x0BE7, 0x0BB7, 0x0B82}, {0x0BE8, 0x0000, 0x0000}, {0x0BE9, 0x0000, 0x0000}, @@ -331,8 +331,8 @@ {0x0BEB, 0x0000, 0x0000}, {0x2018, 0x0000, 0x0000}, {0x2019, 0x0000, 0x0000}, - {0x201C, 0x0000, 0x0000}, - {0x201C, 0x0000, 0x0000}, // two of the same?? + {0x201C, 0x0000, 0x0000}, // double quote left + {0x201C, 0x0000, 0x0000}, // double quote right {0x0BEC, 0x0000, 0x0000}, {0x0BED, 0x0000, 0x0000}, {0x0BEE, 0x0000, 0x0000}, @@ -420,24 +420,26 @@ {0x0BB3, 0x0BC2, 0x0000}, {0x0BB1, 0x0BC2, 0x0000}, {0x0BA9, 0x0BC2, 0x0000}, - {0x0B95, 0x0B82, 0x0000}, - {0x0B99, 0x0B82, 0x0000}, - {0x0B9A, 0x0B82, 0x0000}, - {0x0B9E, 0x0B82, 0x0000}, - {0x0B9F, 0x0B82, 0x0000}, - {0x0BA3, 0x0B82, 0x0000}, - {0x0BA1, 0x0B82, 0x0000}, - {0x0BA8, 0x0B82, 0x0000}, - {0x0BAA, 0x0B82, 0x0000}, - {0x0BAE, 0x0B82, 0x0000}, - {0x0BAF, 0x0B82, 0x0000}, - {0x0BB0, 0x0B82, 0x0000}, - {0x0BB2, 0x0B82, 0x0000}, - {0x0BB5, 0x0B82, 0x0000}, - {0x0BB4, 0x0B82, 0x0000}, - {0x0BB3, 0x0B82, 0x0000}, - {0x0BB1, 0x0B82, 0x0000}, - {0x0BA9, 0x0B82, 0x0000} + {0x0B95, 0x0BCD, 0x0000}, + {0x0B99, 0x0BCD, 0x0000}, + {0x0B9A, 0x0BCD, 0x0000}, + {0x0B9E, 0x0BCD, 0x0000}, + {0x0B9F, 0x0BCD, 0x0000}, + {0x0BA3, 0x0BCD, 0x0000}, + {0x0BA4, 0x0BCD, 0x0000}, + {0x0BA8, 0x0BCD, 0x0000}, + {0x0BAA, 0x0BCD, 0x0000}, + {0x0BAE, 0x0BCD, 0x0000}, + {0x0BAF, 0x0BCD, 0x0000}, + {0x0BB0, 0x0BCD, 0x0000}, + {0x0BB2, 0x0BCD, 0x0000}, + {0x0BB5, 0x0BCD, 0x0000}, + {0x0BB4, 0x0BCD, 0x0000}, + {0x0BB3, 0x0BCD, 0x0000}, + {0x0BB1, 0x0BCD, 0x0000}, + {0x0BA9, 0x0BCD, 0x0000}, + {0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000} }; static int cmp(const ushort *s1, const ushort *s2, size_t len) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/core5.pro new/qt5compat-everywhere-src-6.0.2/src/core5/core5.pro --- old/qt5compat-everywhere-src-6.0.0/src/core5/core5.pro 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/core5.pro 2021-02-25 00:54:29.000000000 +0100 @@ -5,7 +5,7 @@ QT_FOR_CONFIG += core-private QT_FOR_PRIVATE += core-private -QMAKE_DOCS = $$PWD/doc/qtcore5.qdocconf +QMAKE_DOCS = $$PWD/doc/qtcore5compat.qdocconf include(codecs/codecs.pri) include(sax/sax.pri) @@ -21,3 +21,4 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS load(qt_module) +QMAKE_DOCS_TARGETDIR = qtcore5compat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/doc/qtcore5.qdocconf new/qt5compat-everywhere-src-6.0.2/src/core5/doc/qtcore5.qdocconf --- old/qt5compat-everywhere-src-6.0.0/src/core5/doc/qtcore5.qdocconf 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/doc/qtcore5.qdocconf 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) -url.examples = "https://code.qt.io/cgit/qt/qt5compat.git/tree/examples/\1?h=$QT_VER"; - -project = QtCore5Compat -description = Qt 5 Core Compatibility APIs Documentation -version = $QT_VERSION - -qhp.projects = QtCore5Compat - -qhp.QtCore5Compat.file = qtcore5.qhp -qhp.QtCore5Compat.namespace = org.qt-project.qtcore5.$QT_VERSION_TAG -qhp.QtCore5Compat.virtualFolder = qtcore5 -qhp.QtCore5Compat.indexTitle = Qt 5 Core Compatibility APIs -qhp.QtCore5Compat.indexRoot = - -qhp.QtCore5Compat.filterAttributes = qtcore5 $QT_VERSION qtrefdoc -qhp.QtCore5Compat.customFilters.Qt.name = QtCore5Compat $QT_VERSION -qhp.QtCore5Compat.customFilters.Qt.filterAttributes = qtcore5 $QT_VERSION - -qhp.QtCore5Compat.subprojects = classes - -qhp.QtCore5Compat.subprojects.classes.title = C++ Classes -qhp.QtCore5Compat.subprojects.classes.indexTitle = Qt 5 Compat C++ Classes -qhp.QtCore5Compat.subprojects.classes.selectors = class headerfile -qhp.QtCore5Compat.subprojects.classes.sortPages = true - -headerdirs += .. -sourcedirs += .. -exampledirs += snippets \ - ../../../examples/core5 - -examplesinstallpath = core5 -imagedirs += images -excludedirs += snippets - -excludefiles += ../../../examples/core5/widgets/tools/codecs/doc/src/codecs.qdoc - -depends += qtcore qtdoc qmake qtnetwork qtcmake - -navigation.landingpage = "Qt 5 Core Compatibility APIs" -navigation.cppclassespage = "Qt 5 Core Compatibility C++ Classes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/src/core5/doc/qtcore5compat.qdocconf new/qt5compat-everywhere-src-6.0.2/src/core5/doc/qtcore5compat.qdocconf --- old/qt5compat-everywhere-src-6.0.0/src/core5/doc/qtcore5compat.qdocconf 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/src/core5/doc/qtcore5compat.qdocconf 2021-02-25 00:54:29.000000000 +0100 @@ -0,0 +1,41 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +url.examples = "https://code.qt.io/cgit/qt/qt5compat.git/tree/examples/\1?h=$QT_VER"; + +project = QtCore5Compat +description = Qt 5 Core Compatibility APIs Documentation +version = $QT_VERSION + +qhp.projects = QtCore5Compat + +qhp.QtCore5Compat.file = qtcore5compat.qhp +qhp.QtCore5Compat.namespace = org.qt-project.qtcore5.$QT_VERSION_TAG +qhp.QtCore5Compat.virtualFolder = qtcore5compat +qhp.QtCore5Compat.indexTitle = Qt 5 Core Compatibility APIs +qhp.QtCore5Compat.indexRoot = + +qhp.QtCore5Compat.filterAttributes = qtcore5compat $QT_VERSION qtrefdoc +qhp.QtCore5Compat.customFilters.Qt.name = QtCore5Compat $QT_VERSION +qhp.QtCore5Compat.customFilters.Qt.filterAttributes = qtcore5 $QT_VERSION + +qhp.QtCore5Compat.subprojects = classes + +qhp.QtCore5Compat.subprojects.classes.title = C++ Classes +qhp.QtCore5Compat.subprojects.classes.indexTitle = Qt 5 Core Compatibility C++ Classes +qhp.QtCore5Compat.subprojects.classes.selectors = class headerfile +qhp.QtCore5Compat.subprojects.classes.sortPages = true + +headerdirs += .. +sourcedirs += .. +exampledirs += snippets \ + ../../../examples/core5 + +examplesinstallpath = core5 +imagedirs += images +excludedirs += snippets + +excludefiles += ../../../examples/core5/widgets/tools/codecs/doc/src/codecs.qdoc + +depends += qtcore qtdoc qmake qtnetwork qtcmake + +navigation.landingpage = "Qt 5 Core Compatibility APIs" +navigation.cppclassespage = "Qt 5 Core Compatibility C++ Classes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5compat-everywhere-src-6.0.0/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp new/qt5compat-everywhere-src-6.0.2/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp --- old/qt5compat-everywhere-src-6.0.0/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp 2020-12-04 16:35:30.000000000 +0100 +++ new/qt5compat-everywhere-src-6.0.2/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp 2021-02-25 00:54:29.000000000 +0100 @@ -58,6 +58,8 @@ void codecForLocale(); void asciiToIscii() const; + void unicodeToISCII(); + void nonFlaggedCodepointFFFF() const; void flagF7808080() const; void nonFlaggedEFBFBF() const; @@ -65,6 +67,11 @@ void aliasForUTF16() const; void mibForTSCII() const; void codecForTSCII() const; + void asciiToTSCII(); + void unicodeToTSCII(); + + void iso8859_1() const; + void iso8859_15() const; void iso8859_16() const; void utf8Codec_data(); @@ -98,6 +105,9 @@ void shiftJis(); void userCodec(); + + void nullInputZeroOrNegativLength_data(); + void nullInputZeroOrNegativLength(); }; void tst_QTextCodec::toUnicode_data() @@ -404,6 +414,39 @@ } } +void tst_QTextCodec::unicodeToISCII() +{ + auto codec = QTextCodec::codecForName("iscii-tml"); + QVERIFY(codec != nullptr); + + auto ba = QByteArray::fromHex("ABA3B3DD"); + auto steel = QString("\u0b8e\u0b83\u0b95\u0bc1"); + + QTextCodec::ConverterState state; + QCOMPARE(codec->fromUnicode(steel.constData(), steel.size(), &state), ba); + state.clear(); + QCOMPARE(codec->toUnicode(ba.constData(), ba.size(), &state), steel); + + codec = QTextCodec::codecForName("iscii-dev"); + QVERIFY(codec != nullptr); + + ba = QByteArray::fromHex("e8e8"); + auto zwnj = QString("\u094d\u200c"); + + state.clear(); + QCOMPARE(codec->fromUnicode(zwnj.constData(), zwnj.size(), &state), ba); + state.clear(); + QCOMPARE(codec->toUnicode(ba.constData(), ba.size(), &state), zwnj); + + ba = QByteArray::fromHex("e8e9"); + auto zwj = QString("\u094d\u200d"); + + state.clear(); + QCOMPARE(codec->fromUnicode(zwj.constData(), zwj.size(), &state), ba); + state.clear(); + QCOMPARE(codec->toUnicode(ba.constData(), ba.size(), &state), zwj); +} + void tst_QTextCodec::nonFlaggedCodepointFFFF() const { //Check that the code point 0xFFFF (=non-character code 0xEFBFBF) is not flagged @@ -517,6 +560,94 @@ QCOMPARE(codec->mibEnum(), 2107); } +void tst_QTextCodec::asciiToTSCII() +{ + /* Add all low, 7-bit ASCII characters. */ + QString ascii; + const int len = 0x7F - 1; + ascii.resize(len); + + for (int i = 0; i < len; ++i) + ascii[i] = QChar(i + 1); + + QTextCodec* textCodec = QTextCodec::codecForName("TSCII"); + QVERIFY(textCodec); + + for (int i2 = 0; i2 < len; ++i2) { + /* For each character in ascii. */ + const QChar c(ascii[i2]); + QVERIFY2(textCodec->canEncode(c), + qPrintable(QString::fromLatin1("Failed to encode %1 with encoding TSCII") + .arg(QString::number(c.unicode())))); + } + + QVERIFY(textCodec->canEncode(QStringView(ascii))); + QVERIFY2(textCodec->canEncode(ascii), "Failed for full string with encoding TSCII"); +} + +void tst_QTextCodec::unicodeToTSCII() +{ + QTextCodec* codec = QTextCodec::codecForName("TSCII"); + QVERIFY(codec != nullptr); + + auto st = QString("\u0BA4\u0BBE\u0BAF\u0BCDKCharselect unicode block name"); + auto ba = QByteArray::fromHex("BEA1F6") + "KCharselect unicode block name"; + + QTextCodec::ConverterState state; + QCOMPARE(codec->fromUnicode(st.constData(), st.size(), &state), ba); + QCOMPARE(codec->toUnicode(ba.constData(), ba.size(), &state), st); + + st = QString("\u0BB5\u0BA3\u0B95\u0BCD\u0B95\u0BAE\u0BCD"); // Welcome + ba = QByteArray::fromHex("c5bdecb8f5"); + + state.clear(); + QCOMPARE(codec->fromUnicode(st.constData(), st.size(), &state), ba); + QCOMPARE(codec->toUnicode(ba.constData(), ba.size(), &state), st); +} + +void tst_QTextCodec::iso8859_1() const +{ + QTextCodec* codec = QTextCodec::codecForName("ISO8859-1"); + QVERIFY(codec); + QCOMPARE(codec->name(), QByteArray("ISO-8859-1")); + + auto st = QString("Invalid unicode character " + "\u20AC"); // EURO SIGN + auto ba = QByteArray::fromHex("496e76616c696420756e69636f646520636861726163746572203f"); + QTextCodec::ConverterState state; + QCOMPARE(codec->fromUnicode(st.constData(), st.size(), &state), ba); +} + +void tst_QTextCodec::iso8859_15() const +{ + QTextCodec* codec = QTextCodec::codecForName("ISO8859-15"); + QVERIFY(codec); + QCOMPARE(codec->name(), QByteArray("ISO-8859-15")); + + auto st = QString("Special unicode characters " + "\u20AC, " // EURO SIGN + "\u0160, " // LATIN CAPITAL LETTER S WITH CARON + "\u0161, " // LATIN SMALL LETTER S WITH CARON + "\u017d, " // LATIN CAPITAL LETTER Z WITH CARON + "\u017e, " // LATIN SMALL LETTER Z WITH CARON + "\u0152, " // LATIN CAPITAL LIGATURE OE + "\u0153, " // LATIN SMALL LIGATURE OE + "\u0178"); // LATIN CAPITAL LETTER Y WITH DIAERESIS + auto ba = QByteArray::fromHex("5370656369616c20756e69636f6465206368617261637465727320" + "a42C20" // EURO SIGN + "a62C20" // LATIN CAPITAL LETTER S WITH CARON + "a82C20" // LATIN SMALL LETTER S WITH CARON + "b42C20" // LATIN CAPITAL LETTER Z WITH CARON + "b82C20" // LATIN SMALL LETTER Z WITH CARON + "bc2C20" // LATIN CAPITAL LIGATURE OE + "bd2C20" // LATIN SMALL LIGATURE OE + "be"); // LATIN CAPITAL LETTER Y WITH DIAERESIS + + QTextCodec::ConverterState state; + QCOMPARE(codec->fromUnicode(st.constData(), st.size(), &state), ba); + QCOMPARE(codec->toUnicode(ba.constData(), ba.size(), &state), st); +} + void tst_QTextCodec::iso8859_16() const { QTextCodec *codec = QTextCodec::codecForName("ISO8859-16"); @@ -2457,6 +2588,107 @@ } } dontCrashAtExit; +void tst_QTextCodec::nullInputZeroOrNegativLength_data() +{ + QTest::addColumn<QString>("codecName"); + QTest::addColumn<int>("mibEnum"); + + QTest::newRow("Big5") << "Big5" << 2026; + QTest::newRow("Big5-HKSCS") << "Big5-HKSCS" << 2101; + QTest::newRow("EUC-JP") << "EUC-JP" << 18; + QTest::newRow("iscii-dev") << "iscii-dev" << -3000; + QTest::newRow("iscii-bng") << "iscii-bng" << -3001; + QTest::newRow("iscii-pnj") << "iscii-pnj" << -3002; + QTest::newRow("iscii-gjr") << "iscii-gjr" << -3003; + QTest::newRow("iscii-ori") << "iscii-ori" << -3004; + QTest::newRow("iscii-tml") << "iscii-tml" << -3005; + QTest::newRow("iscii-tlg") << "iscii-tlg" << -3006; + QTest::newRow("iscii-knd") << "iscii-knd" << -3007; + QTest::newRow("iscii-mlm") << "iscii-mlm" << -3008; + QTest::newRow("ISO-2022-JP") << "ISO-2022-JP" << 39; + QTest::newRow("ISO-8859-1") << "ISO-8859-1" << 4; + QTest::newRow("ISO-8859-15") << "ISO-8859-15" << 111; + QTest::newRow("KOI8-R") << "KOI8-R" << 2084; + QTest::newRow("KOI8-U") << "KOI8-U" << 2088; + QTest::newRow("ISO-8859-1") << "ISO-8859-1" << 4; + QTest::newRow("ISO-8859-2") << "ISO-8859-2" << 5; + QTest::newRow("ISO-8859-3") << "ISO-8859-3" << 6; + QTest::newRow("ISO-8859-4") << "ISO-8859-4" << 7; + QTest::newRow("ISO-8859-5") << "ISO-8859-5" << 8; + QTest::newRow("ISO-8859-9") << "ISO-8859-9" << 12; + QTest::newRow("ISO-8859-10") << "ISO-8859-10" << 13; + QTest::newRow("ISO-8859-13") << "ISO-8859-13" << 109; + QTest::newRow("ISO-8859-14") << "ISO-8859-14" << 110; + QTest::newRow("ISO-8859-16") << "ISO-8859-16" << 112; + QTest::newRow("IBM850") << "IBM850" << 2009; + QTest::newRow("IBM866") << "IBM866" << 2086; + QTest::newRow("windows-1250") << "windows-1250" << 2250; + QTest::newRow("windows-1251") << "windows-1251" << 2251; + QTest::newRow("windows-1252") << "windows-1252" << 2252; + QTest::newRow("windows-1253") << "windows-1253" << 2253; + QTest::newRow("windows-1254") << "windows-1254" << 2254; + QTest::newRow("windows-1255") << "windows-1255" << 2255; + QTest::newRow("windows-1256") << "windows-1256" << 2256; + QTest::newRow("windows-1257") << "windows-1257" << 2257; + QTest::newRow("windows-1258") << "windows-1258" << 2258; + QTest::newRow("macintosh") << "macintosh" << 2027; + QTest::newRow("TIS-620") << "TIS-620" << 2259; + QTest::newRow("hp-roman8") << "hp-roman8" << 2004; + QTest::newRow("Shift_JIS") << "Shift_JIS" << 17; + QTest::newRow("TSCII") << "TSCII" << 2107; + QTest::newRow("UTF-8") << "UTF-8" << 106; + QTest::newRow("UTF-16") << "UTF-16" << 1015; + QTest::newRow("UTF-16BE") << "UTF-16BE" << 1013; + QTest::newRow("UTF-16LE") << "UTF-16LE" << 1014; + QTest::newRow("UTF-32") << "UTF-32" << 1017; + QTest::newRow("UTF-32BE") << "UTF-32BE" << 1018; + QTest::newRow("UTF-32LE") << "UTF-32LE" << 1019; +#ifdef Q_OS_WIN + QTest::newRow("EUC-KR") << "EUC-KR" << 38; + QTest::newRow("windows-949") << "windows-949" << -949; + QTest::newRow("GBK") << "GBK" << 113; + QTest::newRow("GB2312") << "GB2312" << 2025; + QTest::newRow("ISO-8859-6") << "ISO-8859-6" << 82; + QTest::newRow("ISO-8859-7") << "ISO-8859-7" << 10; + QTest::newRow("ISO-8859-8") << "ISO-8859-8" << 85; + QTest::newRow("IBM874") << "IBM874" << -874; + QTest::newRow("WINSAMI2") << "WINSAMI2" << -165; + QTest::newRow("System") << "System" << 0; +#endif +} + +void tst_QTextCodec::nullInputZeroOrNegativLength() +{ + QFETCH(QString, codecName); + QFETCH(int, mibEnum); + + QTextCodec* codec = QTextCodec::codecForName(codecName.toLatin1()); + QVERIFY(codec != nullptr); + QCOMPARE(codec->mibEnum(), mibEnum); + + // null input + QCOMPARE(codec->toUnicode(nullptr), QString()); + QCOMPARE(codec->toUnicode(nullptr, 0), QString()); + QCOMPARE(codec->toUnicode(nullptr, -1), QString()); + QCOMPARE(codec->toUnicode(nullptr, 128), QString()); + + // zero, negative length + QCOMPARE(codec->toUnicode("abc", 0), QString()); + QCOMPARE(codec->toUnicode("abc", -1), QString()); + + // null input + QChar* dummy = nullptr; + QStringView view{ dummy }; + QCOMPARE(codec->fromUnicode(view), QByteArray()); + QCOMPARE(codec->fromUnicode(nullptr, 0), QByteArray()); + QCOMPARE(codec->fromUnicode(nullptr, -1), QByteArray()); + QCOMPARE(codec->fromUnicode(nullptr, 128), QByteArray()); + + // zero, negative length + QCOMPARE(codec->fromUnicode(QString("abc").constData(), 0), QByteArray()); + QCOMPARE(codec->fromUnicode(QString("abc").constData(), -1), QByteArray()); +} + QT_END_NAMESPACE QTEST_MAIN(tst_QTextCodec)
