Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-imageformats for
openSUSE:Factory checked in at 2021-03-17 20:14:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-imageformats (Old)
and /work/SRC/openSUSE:Factory/.qt6-imageformats.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-imageformats"
Wed Mar 17 20:14:25 2021 rev:2 rq:877998 version:6.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-imageformats/qt6-imageformats.changes
2020-12-18 19:58:45.730022319 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-imageformats.new.2401/qt6-imageformats.changes
2021-03-17 20:17:51.847146048 +0100
@@ -1,0 +2,12 @@
+Fri Mar 5 09:31:20 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 6.0.2:
+ https://www.qt.io/blog/qt-6.0.2-released
+
+-------------------------------------------------------------------
+Thu Feb 4 07:32:56 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 6.0.1
+ https://code.qt.io/cgit/qt/qtreleasenotes.git/tree/qt/6.0.1/release-note.txt
+
+-------------------------------------------------------------------
Old:
----
qtimageformats-everywhere-src-6.0.0.tar.xz
New:
----
qtimageformats-everywhere-src-6.0.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-imageformats.spec ++++++
--- /var/tmp/diff_new_pack.8JhNhm/_old 2021-03-17 20:17:52.387146787 +0100
+++ /var/tmp/diff_new_pack.8JhNhm/_new 2021-03-17 20:17:52.387146787 +0100
@@ -1,7 +1,7 @@
#
# spec file for package qt6-imageformats
#
-# 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 short_name qtimageformats
%define tar_name qtimageformats-everywhere-src
@@ -28,12 +28,12 @@
%endif
#
Name: qt6-imageformats%{?pkg_suffix}
-Version: 6.0.0
+Version: 6.0.2
Release: 0
Summary: Qt 6 ImageFormat Plugins
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/additional_libraries/%{short_name}/%{short_version}/%{real_version}%{tar_suffix}/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
+Source:
https://download.qt.io/official_releases/additional_libraries/%{short_version}/%{real_version}/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source99: qt6-imageformats-rpmlintrc
BuildRequires: libtiff-devel
BuildRequires: pkgconfig
++++++ qtimageformats-everywhere-src-6.0.0.tar.xz ->
qtimageformats-everywhere-src-6.0.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT
new/qtimageformats-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT
--- old/qtimageformats-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT
2020-12-07 06:50:31.040647000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT
2021-02-25 07:38:07.802406800 +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/qtimageformats-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
new/qtimageformats-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
---
old/qtimageformats-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
2020-12-07 06:50:31.040647000 +0100
+++
new/qtimageformats-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
2021-02-25 07:38:07.802406800 +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/qtimageformats-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
new/qtimageformats-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
---
old/qtimageformats-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
2020-12-07 06:50:31.040647000 +0100
+++
new/qtimageformats-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
2021-02-25 07:38:07.798406800 +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/qtimageformats-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
new/qtimageformats-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
---
old/qtimageformats-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
2020-12-07 06:50:31.040647000 +0100
+++
new/qtimageformats-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
2021-02-25 07:38:07.802406800 +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/qtimageformats-everywhere-src-6.0.0/.cmake.conf
new/qtimageformats-everywhere-src-6.0.2/.cmake.conf
--- old/qtimageformats-everywhere-src-6.0.0/.cmake.conf 2020-12-07
06:25:23.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/.cmake.conf 2021-02-25
07:09:14.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/qtimageformats-everywhere-src-6.0.0/.qmake.conf
new/qtimageformats-everywhere-src-6.0.2/.qmake.conf
--- old/qtimageformats-everywhere-src-6.0.0/.qmake.conf 2020-12-07
06:25:23.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/.qmake.conf 2021-02-25
07:09:14.000000000 +0100
@@ -2,5 +2,5 @@
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/qtimageformats-everywhere-src-6.0.0/.tag
new/qtimageformats-everywhere-src-6.0.2/.tag
--- old/qtimageformats-everywhere-src-6.0.0/.tag 2020-12-07
06:25:23.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/.tag 2021-02-25
07:09:14.000000000 +0100
@@ -1 +1 @@
-84d1b847be7d29be6a7cbadeeaec247095bfe907
+f83d417b7b8595b384f9fba96b96107f474df33a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.0.0/cmake/FindWrapWebP.cmake
new/qtimageformats-everywhere-src-6.0.2/cmake/FindWrapWebP.cmake
--- old/qtimageformats-everywhere-src-6.0.0/cmake/FindWrapWebP.cmake
2020-12-07 06:25:23.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/cmake/FindWrapWebP.cmake
2021-02-25 07:09:14.000000000 +0100
@@ -6,10 +6,10 @@
# paths as hints.
find_package(WebP QUIET)
-if(TARGET WebP::webp AND TARGET WebP::webpdemux AND TARGET WebP::webpmux)
+if(TARGET WebP::webp AND TARGET WebP::webpdemux AND TARGET WebP::libwebpmux)
set(WrapWebP_FOUND ON)
add_library(WrapWebP::WrapWebP INTERFACE IMPORTED)
- target_link_libraries(WrapWebP::WrapWebP INTERFACE WebP::webp
WebP::webpdemux Webp::webpmux)
+ target_link_libraries(WrapWebP::WrapWebP INTERFACE WebP::webp
WebP::webpdemux WebP::libwebpmux)
return()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.0/conanfile.py
new/qtimageformats-everywhere-src-6.0.2/conanfile.py
--- old/qtimageformats-everywhere-src-6.0.0/conanfile.py 1970-01-01
01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/conanfile.py 2021-02-25
07:09:14.000000000 +0100
@@ -0,0 +1,129 @@
+#############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the release tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+from conans import ConanFile, tools, CMake
+import os
+
+
+class QtConanError(Exception):
+ pass
+
+
+class QtImageFormats(ConanFile):
+ name = "qtimageformats"
+ version = "6.0.2"
+ license = "LGPL-3.0+, GPL-2.0+, Commercial Qt License Agreement"
+ author = "The Qt Company <https://www.qt.io/contact-us>"
+ url = "https://code.qt.io/cgit/qt/qtimageformats.git";
+ description = "Additional Image Format plugins for Qt."
+ topics = ("qt", "qt6", "addon", "icns", "jp2", "mng", "tga", "tiff",
"wbmb", "webp")
+ settings = "os", "compiler", "build_type", "arch"
+ options = {"shared": [True, False],
+ "qt6": "ANY"} # this is needed to model unique package_id for
the Add-on build per used Qt6 version
+ default_options = {"shared": False,
+ "qt6": None}
+ exports_sources = "*", "!conan*.*"
+
+ def source(self):
+ # sources are installed next to recipe, no need to clone etc. sources
here
+ pass
+
+ def _get_cmake_prefix_path(self):
+ # 'QT_PATH' provided as env variable in profile file which is part of
the Qt essential binary
+ # package(s). Installed under .conan/profiles
+ cmake_prefix_path = os.environ.get("QT_PATH")
+ if not cmake_prefix_path:
+ raise QtConanError("'QT_PATH' not defined! The 'QT_PATH' needs to
point to Qt installation directory.")
+ print(f"CMAKE_PREFIX_PATH for '{self.name}/{self.version}' build is:
{cmake_prefix_path}")
+ return cmake_prefix_path
+
+ def _read_env(self, key):
+ value = os.environ.get(key)
+ if not value:
+ raise QtConanError(f"{self.settings.os} build specified but
'{key}' was not defined?")
+ return value
+
+ def _get_qtcmake(self):
+ qt_install_path = self._get_cmake_prefix_path()
+ ext = ".bat" if tools.os_info.is_windows else ""
+ qtcmake = os.path.abspath(os.path.join(qt_install_path, "bin",
"qt-cmake" + ext))
+ if not os.path.exists(qtcmake):
+ raise QtConanError(f"Unable to locate {qtcmake} from 'QT_PATH':
{qt_install_path}")
+ return qtcmake
+
+ def _get_cmake_tool(self):
+ cmake = CMake(self, cmake_program=self._get_qtcmake())
+ cmake.verbose = True
+
+ # Qt modules need to be 'installed'.
+ # We need to direct the 'make install' to some directory under Conan
cache,
+ # place it under the current build directory which is also under the
Conan cache.
+ # Note, the actual 'make install' is called in "package()".
+ install_dir = os.path.join(os.getcwd(), "_install_tmp")
+ cmake.definitions["CMAKE_INSTALL_PREFIX"] = install_dir
+
+ cmake_toolchain_file = os.environ.get("CMAKE_TOOLCHAIN_FILE")
+ if cmake_toolchain_file:
+ cmake.definitions["CMAKE_TOOLCHAIN_FILE"] = cmake_toolchain_file
+
+ if self.settings.os == "Android":
+ cmake.definitions["ANDROID_SDK_ROOT"] =
self._read_env('ANDROID_SDK_ROOT')
+ cmake.definitions["ANDROID_NDK_ROOT"] =
self._read_env('ANDROID_NDK_ROOT')
+
+ if self.settings.os == "iOS":
+ # Instead of Conan's auto-added 'Darwin', explicitly pass 'iOS'.
+ cmake.definitions["CMAKE_SYSTEM_NAME"] = "iOS"
+
+ # Remove the explicit sysroot, let CMake detect the sysroots, to
ensure
+ # that multi-arch builds work.
+ del cmake.definitions["CMAKE_OSX_SYSROOT"]
+
+ # Remove the conan provided architecture, instead rely on the
architectures set
+ # by the Qt toolchain file, which with official Qt packages most
likely means
+ # multi-arch iOS.
+ del cmake.definitions["CMAKE_OSX_ARCHITECTURES"]
+
+ return cmake
+
+ def build(self):
+ cmake = self._get_cmake_tool()
+ self.run('%s "%s" %s' % (self._get_qtcmake(), self.source_folder,
cmake.command_line))
+ self.run('cmake --build . %s' % cmake.build_config)
+
+ def package(self):
+ install_dir = os.path.join(os.getcwd(), "_install_tmp") # see
'CMAKE_INSTALL_PREFIX' above
+ self.run('cmake --build . --target install')
+ self.copy("*", src=install_dir, dst=".")
+
+ def package_info(self):
+ self.cpp_info.libs = ["Qt6ImageFormats"] # used for the actual
library filename, Ordered list with the library names
+
+ def deploy(self):
+ self.copy("*") # copy from current package
+ self.copy_deps("*") # copy from dependencies
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.0/configure.cmake
new/qtimageformats-everywhere-src-6.0.2/configure.cmake
--- old/qtimageformats-everywhere-src-6.0.0/configure.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/configure.cmake 2021-02-25
07:09:14.000000000 +0100
@@ -0,0 +1,21 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+
+
+#### Tests
+
+
+
+#### Features
+
+
+qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC)
+qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC)
+qt_extra_definition("QT_VERSION_MINOR" ${PROJECT_VERSION_MINOR} PUBLIC)
+qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.0.0/dependencies.yaml
new/qtimageformats-everywhere-src-6.0.2/dependencies.yaml
--- old/qtimageformats-everywhere-src-6.0.0/dependencies.yaml 2020-12-07
06:25:23.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/dependencies.yaml 2021-02-25
07:09:14.000000000 +0100
@@ -1,7 +1,7 @@
dependencies:
../qtbase:
- ref: fc9cda5f08ac848e88f63dd4a07c08b2fbc6bf17
+ ref: 723077eb3529810aa3b99d8c06f9b81a586763c9
required: true
../qttools:
- ref: 3fd594493c3ba31639a7515b901554456a90b4c7
+ ref: e9c0625d07ed4d476cd8fdba4cfb4d2509f46317
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.0.0/dist/changes-6.0.x
new/qtimageformats-everywhere-src-6.0.2/dist/changes-6.0.x
--- old/qtimageformats-everywhere-src-6.0.0/dist/changes-6.0.x 1970-01-01
01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/dist/changes-6.0.x 2021-02-25
07:09:14.000000000 +0100
@@ -0,0 +1,19 @@
+Qt 6.0.x releases are bug fix releases to the top of Qt 6.0.0.
+
+List of changes compared to the previous patch release can be found from
+https://wiki.qt.io/Qt_6.0.x_Changes -wiki
+
+The goal has been to retain as much source compatibility with Qt 5.15 as
+possible, but some changes were inevitable to make Qt a better framework.
+
+To make it easier to port to Qt 6.0, we have created a porting guide to
+summarize those changes and provide guidance to handle them. In the guide, you
+can find links to articles about changes that may affect your application and
+help you transition from Qt 5.15 to Qt 6.0:
+
+https://doc.qt.io/qt-6/portingguide.html
+
+For more details refer to the online documentation of Qt 6.0:
+
+https://doc.qt.io/qt-6/index.html
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.0/qt_cmdline.cmake
new/qtimageformats-everywhere-src-6.0.2/qt_cmdline.cmake
--- old/qtimageformats-everywhere-src-6.0.0/qt_cmdline.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/qt_cmdline.cmake 2021-02-25
07:09:14.000000000 +0100
@@ -0,0 +1 @@
+qt_commandline_subconfig(src/imageformats)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.0.0/src/imageformats/configure.cmake
new/qtimageformats-everywhere-src-6.0.2/src/imageformats/configure.cmake
--- old/qtimageformats-everywhere-src-6.0.0/src/imageformats/configure.cmake
2020-12-07 06:25:23.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/src/imageformats/configure.cmake
2021-02-25 07:09:14.000000000 +0100
@@ -38,7 +38,7 @@
)
qt_feature("tiff" PRIVATE
LABEL "TIFF"
- CONDITION QT_FEATURE_imageformatplugin AND TIFF_FOUND
+ CONDITION QT_FEATURE_imageformatplugin
DISABLE INPUT_tiff STREQUAL 'no'
)
qt_feature("system-tiff" PRIVATE
@@ -49,7 +49,7 @@
)
qt_feature("webp" PRIVATE
LABEL "WEBP"
- CONDITION QT_FEATURE_imageformatplugin AND WrapWebP_FOUND
+ CONDITION QT_FEATURE_imageformatplugin
DISABLE INPUT_webp STREQUAL 'no'
)
qt_feature("system-webp" PRIVATE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.0.0/src/imageformats/qt_cmdline.cmake
new/qtimageformats-everywhere-src-6.0.2/src/imageformats/qt_cmdline.cmake
--- old/qtimageformats-everywhere-src-6.0.0/src/imageformats/qt_cmdline.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.0.2/src/imageformats/qt_cmdline.cmake
2021-02-25 07:09:14.000000000 +0100
@@ -0,0 +1,4 @@
+qt_commandline_option(jasper TYPE boolean)
+qt_commandline_option(mng TYPE boolean)
+qt_commandline_option(tiff TYPE enum VALUES no qt system)
+qt_commandline_option(webp TYPE enum VALUES no qt system)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.0.0/src/plugins/imageformats/tiff/qtiffhandler.cpp
new/qtimageformats-everywhere-src-6.0.2/src/plugins/imageformats/tiff/qtiffhandler.cpp
---
old/qtimageformats-everywhere-src-6.0.0/src/plugins/imageformats/tiff/qtiffhandler.cpp
2020-12-07 06:25:23.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.0.2/src/plugins/imageformats/tiff/qtiffhandler.cpp
2021-02-25 07:09:14.000000000 +0100
@@ -423,14 +423,19 @@
quint32 tileWidth, tileLength;
TIFFGetField(tiff, TIFFTAG_TILEWIDTH, &tileWidth);
TIFFGetField(tiff, TIFFTAG_TILELENGTH, &tileLength);
- uchar *buf = (uchar *)_TIFFmalloc(TIFFTileSize(tiff));
- if (!tileWidth || !tileLength || !buf) {
- _TIFFfree(buf);
+ if (!tileWidth || !tileLength || tileWidth % 16 || tileLength %
16) {
d->close();
return false;
}
quint32 byteWidth = (format == QImage::Format_Mono) ? (width +
7)/8 : (width * bytesPerPixel);
quint32 byteTileWidth = (format == QImage::Format_Mono) ?
tileWidth/8 : (tileWidth * bytesPerPixel);
+ tmsize_t byteTileSize = TIFFTileSize(tiff);
+ uchar *buf = (uchar *)_TIFFmalloc(byteTileSize);
+ if (!buf || byteTileSize / tileLength < byteTileWidth) {
+ _TIFFfree(buf);
+ d->close();
+ return false;
+ }
for (quint32 y = 0; y < height; y += tileLength) {
for (quint32 x = 0; x < width; x += tileWidth) {
if (TIFFReadTile(tiff, buf, x, y, 0, 0) < 0) {
@@ -835,7 +840,7 @@
void QTiffHandler::setOption(ImageOption option, const QVariant &value)
{
- if (option == CompressionRatio && value.type() == QVariant::Int)
+ if (option == CompressionRatio && value.metaType().id() == QMetaType::Int)
d->compression = qBound(0, value.toInt(), 1);
if (option == ImageTransformation) {
int transformation = value.toInt();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.0.0/src/plugins/imageformats/webp/.prev_CMakeLists.txt
new/qtimageformats-everywhere-src-6.0.2/src/plugins/imageformats/webp/.prev_CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.0.0/src/plugins/imageformats/webp/.prev_CMakeLists.txt
2020-12-07 06:25:23.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.0.2/src/plugins/imageformats/webp/.prev_CMakeLists.txt
2021-02-25 07:09:14.000000000 +0100
@@ -4,7 +4,7 @@
## QWebpPlugin Plugin:
#####################################################################
-qt_add_plugin(QWebpPlugin
+qt_internal_add_plugin(QWebpPlugin
OUTPUT_NAME qwebp
TYPE imageformats
SOURCES
@@ -13,7 +13,6 @@
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
- WrapWebP::WrapWebP
)
#### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
@@ -22,3 +21,153 @@
## Scopes:
#####################################################################
+
+qt_internal_extend_target(QWebpPlugin CONDITION QT_FEATURE_system_webp
+ PUBLIC_LIBRARIES
+ WrapWebP::WrapWebP
+)
+
+qt_internal_extend_target(QWebpPlugin CONDITION NOT QT_FEATURE_system_webp
+ SOURCES
+ ../../../3rdparty/libwebp/src/dec/alpha_dec.c
+ ../../../3rdparty/libwebp/src/dec/buffer_dec.c
+ ../../../3rdparty/libwebp/src/dec/frame_dec.c
+ ../../../3rdparty/libwebp/src/dec/idec_dec.c
+ ../../../3rdparty/libwebp/src/dec/io_dec.c
+ ../../../3rdparty/libwebp/src/dec/quant_dec.c
+ ../../../3rdparty/libwebp/src/dec/tree_dec.c
+ ../../../3rdparty/libwebp/src/dec/vp8_dec.c
+ ../../../3rdparty/libwebp/src/dec/vp8l_dec.c
+ ../../../3rdparty/libwebp/src/dec/webp_dec.c
+ ../../../3rdparty/libwebp/src/demux/anim_decode.c
+ ../../../3rdparty/libwebp/src/demux/demux.c
+ ../../../3rdparty/libwebp/src/dsp/alpha_processing.c
+ ../../../3rdparty/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/alpha_processing_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/alpha_processing_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/cost.c
+ ../../../3rdparty/libwebp/src/dsp/cost_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/cost_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/cost_neon.c
+ ../../../3rdparty/libwebp/src/dsp/cost_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/cpu.c
+ ../../../3rdparty/libwebp/src/dsp/dec.c
+ ../../../3rdparty/libwebp/src/dsp/dec_clip_tables.c
+ ../../../3rdparty/libwebp/src/dsp/dec_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/dec_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/dec_msa.c
+ ../../../3rdparty/libwebp/src/dsp/dec_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/dec_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/enc.c
+ ../../../3rdparty/libwebp/src/dsp/enc_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/enc_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/enc_msa.c
+ ../../../3rdparty/libwebp/src/dsp/enc_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/enc_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/filters.c
+ ../../../3rdparty/libwebp/src/dsp/filters_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/filters_msa.c
+ ../../../3rdparty/libwebp/src/dsp/filters_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/lossless.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_msa.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler_msa.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/ssim.c
+ ../../../3rdparty/libwebp/src/dsp/ssim_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling_msa.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/yuv.c
+ ../../../3rdparty/libwebp/src/dsp/yuv_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/yuv_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/yuv_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/yuv_sse41.c
+ ../../../3rdparty/libwebp/src/enc/alpha_enc.c
+ ../../../3rdparty/libwebp/src/enc/analysis_enc.c
+ ../../../3rdparty/libwebp/src/enc/backward_references_cost_enc.c
+ ../../../3rdparty/libwebp/src/enc/backward_references_enc.c
+ ../../../3rdparty/libwebp/src/enc/config_enc.c
+ ../../../3rdparty/libwebp/src/enc/cost_enc.c
+ ../../../3rdparty/libwebp/src/enc/filter_enc.c
+ ../../../3rdparty/libwebp/src/enc/frame_enc.c
+ ../../../3rdparty/libwebp/src/enc/histogram_enc.c
+ ../../../3rdparty/libwebp/src/enc/iterator_enc.c
+ ../../../3rdparty/libwebp/src/enc/near_lossless_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_csp_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_psnr_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_rescale_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_tools_enc.c
+ ../../../3rdparty/libwebp/src/enc/predictor_enc.c
+ ../../../3rdparty/libwebp/src/enc/quant_enc.c
+ ../../../3rdparty/libwebp/src/enc/syntax_enc.c
+ ../../../3rdparty/libwebp/src/enc/token_enc.c
+ ../../../3rdparty/libwebp/src/enc/tree_enc.c
+ ../../../3rdparty/libwebp/src/enc/vp8l_enc.c
+ ../../../3rdparty/libwebp/src/enc/webp_enc.c
+ ../../../3rdparty/libwebp/src/mux/anim_encode.c
+ ../../../3rdparty/libwebp/src/mux/muxedit.c
+ ../../../3rdparty/libwebp/src/mux/muxinternal.c
+ ../../../3rdparty/libwebp/src/mux/muxread.c
+ ../../../3rdparty/libwebp/src/utils/bit_reader_utils.c
+ ../../../3rdparty/libwebp/src/utils/bit_writer_utils.c
+ ../../../3rdparty/libwebp/src/utils/color_cache_utils.c
+ ../../../3rdparty/libwebp/src/utils/filters_utils.c
+ ../../../3rdparty/libwebp/src/utils/huffman_encode_utils.c
+ ../../../3rdparty/libwebp/src/utils/huffman_utils.c
+ ../../../3rdparty/libwebp/src/utils/quant_levels_dec_utils.c
+ ../../../3rdparty/libwebp/src/utils/quant_levels_utils.c
+ ../../../3rdparty/libwebp/src/utils/random_utils.c
+ ../../../3rdparty/libwebp/src/utils/rescaler_utils.c
+ ../../../3rdparty/libwebp/src/utils/thread_utils.c
+ ../../../3rdparty/libwebp/src/utils/utils.c
+ INCLUDE_DIRECTORIES
+ ../../../3rdparty/libwebp
+ ../../../3rdparty/libwebp/src
+ ../../../3rdparty/libwebp/src/dec
+ ../../../3rdparty/libwebp/src/dsp
+ ../../../3rdparty/libwebp/src/enc
+ ../../../3rdparty/libwebp/src/mux
+ ../../../3rdparty/libwebp/src/utils
+ ../../../3rdparty/libwebp/src/webp
+)
+
+qt_internal_extend_target(QWebpPlugin CONDITION ANDROID AND NOT
ANDROID_EMBEDDED AND NOT QT_FEATURE_system_webp
+ SOURCES
+ /sources/android/cpufeatures/cpu-features.c
+ INCLUDE_DIRECTORIES
+ /sources/android/cpufeatures
+)
+
+#### Keys ignored in scope
6:.:../../../3rdparty:../../../3rdparty/libwebp.pri:INTEGRITY:
+# QMAKE_CFLAGS = "-c99"
+
+#### Keys ignored in scope
12:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else:
+# QMAKE_EXTRA_COMPILERS = "neon_comp"
+# neon_comp.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$$QMAKE_CFLAGS_NEON"
"$(INCPATH)" "${QMAKE_FILE_IN}"
+# neon_comp.dependency_type = "TYPE_C"
+# neon_comp.input = "SOURCES_FOR_NEON"
+# neon_comp.name = "compiling[neon]" "${QMAKE_FILE_IN}"
+# neon_comp.output =
"${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
+# neon_comp.variable_out = "OBJECTS"
+
+#### Keys ignored in scope
13:.:../../../3rdparty:../../../3rdparty/libwebp.pri:MSVC:
+# neon_comp.commands = "-Fo${QMAKE_FILE_OUT}"
+
+#### Keys ignored in scope
14:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else:
+# neon_comp.commands = "-o" "${QMAKE_FILE_OUT}"
+
+#### Keys ignored in scope
15:.:../../../3rdparty:../../../3rdparty/libwebp.pri:silent:
+# neon_comp.commands = "@echo" "compiling[neon]" "${QMAKE_FILE_IN}" "&&"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.0.0/src/plugins/imageformats/webp/CMakeLists.txt
new/qtimageformats-everywhere-src-6.0.2/src/plugins/imageformats/webp/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.0.0/src/plugins/imageformats/webp/CMakeLists.txt
2020-12-07 06:25:23.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.0.2/src/plugins/imageformats/webp/CMakeLists.txt
2021-02-25 07:09:14.000000000 +0100
@@ -13,7 +13,6 @@
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
- WrapWebP::WrapWebP
)
#### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
@@ -22,3 +21,170 @@
## Scopes:
#####################################################################
+
+qt_internal_extend_target(QWebpPlugin CONDITION QT_FEATURE_system_webp
+ PUBLIC_LIBRARIES
+ WrapWebP::WrapWebP
+)
+
+qt_internal_extend_target(QWebpPlugin CONDITION NOT QT_FEATURE_system_webp
+ SOURCES
+ ../../../3rdparty/libwebp/src/dec/alpha_dec.c
+ ../../../3rdparty/libwebp/src/dec/buffer_dec.c
+ ../../../3rdparty/libwebp/src/dec/frame_dec.c
+ ../../../3rdparty/libwebp/src/dec/idec_dec.c
+ ../../../3rdparty/libwebp/src/dec/io_dec.c
+ ../../../3rdparty/libwebp/src/dec/quant_dec.c
+ ../../../3rdparty/libwebp/src/dec/tree_dec.c
+ ../../../3rdparty/libwebp/src/dec/vp8_dec.c
+ ../../../3rdparty/libwebp/src/dec/vp8l_dec.c
+ ../../../3rdparty/libwebp/src/dec/webp_dec.c
+ ../../../3rdparty/libwebp/src/demux/anim_decode.c
+ ../../../3rdparty/libwebp/src/demux/demux.c
+ ../../../3rdparty/libwebp/src/dsp/alpha_processing.c
+ ../../../3rdparty/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/alpha_processing_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/alpha_processing_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/cost.c
+ ../../../3rdparty/libwebp/src/dsp/cost_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/cost_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/cost_neon.c
+ ../../../3rdparty/libwebp/src/dsp/cost_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/cpu.c
+ ../../../3rdparty/libwebp/src/dsp/dec.c
+ ../../../3rdparty/libwebp/src/dsp/dec_clip_tables.c
+ ../../../3rdparty/libwebp/src/dsp/dec_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/dec_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/dec_msa.c
+ ../../../3rdparty/libwebp/src/dsp/dec_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/dec_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/enc.c
+ ../../../3rdparty/libwebp/src/dsp/enc_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/enc_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/enc_msa.c
+ ../../../3rdparty/libwebp/src/dsp/enc_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/enc_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/filters.c
+ ../../../3rdparty/libwebp/src/dsp/filters_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/filters_msa.c
+ ../../../3rdparty/libwebp/src/dsp/filters_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/lossless.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_msa.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler_msa.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/ssim.c
+ ../../../3rdparty/libwebp/src/dsp/ssim_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling_msa.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling_sse41.c
+ ../../../3rdparty/libwebp/src/dsp/yuv.c
+ ../../../3rdparty/libwebp/src/dsp/yuv_mips32.c
+ ../../../3rdparty/libwebp/src/dsp/yuv_mips_dsp_r2.c
+ ../../../3rdparty/libwebp/src/dsp/yuv_sse2.c
+ ../../../3rdparty/libwebp/src/dsp/yuv_sse41.c
+ ../../../3rdparty/libwebp/src/enc/alpha_enc.c
+ ../../../3rdparty/libwebp/src/enc/analysis_enc.c
+ ../../../3rdparty/libwebp/src/enc/backward_references_cost_enc.c
+ ../../../3rdparty/libwebp/src/enc/backward_references_enc.c
+ ../../../3rdparty/libwebp/src/enc/config_enc.c
+ ../../../3rdparty/libwebp/src/enc/cost_enc.c
+ ../../../3rdparty/libwebp/src/enc/filter_enc.c
+ ../../../3rdparty/libwebp/src/enc/frame_enc.c
+ ../../../3rdparty/libwebp/src/enc/histogram_enc.c
+ ../../../3rdparty/libwebp/src/enc/iterator_enc.c
+ ../../../3rdparty/libwebp/src/enc/near_lossless_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_csp_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_psnr_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_rescale_enc.c
+ ../../../3rdparty/libwebp/src/enc/picture_tools_enc.c
+ ../../../3rdparty/libwebp/src/enc/predictor_enc.c
+ ../../../3rdparty/libwebp/src/enc/quant_enc.c
+ ../../../3rdparty/libwebp/src/enc/syntax_enc.c
+ ../../../3rdparty/libwebp/src/enc/token_enc.c
+ ../../../3rdparty/libwebp/src/enc/tree_enc.c
+ ../../../3rdparty/libwebp/src/enc/vp8l_enc.c
+ ../../../3rdparty/libwebp/src/enc/webp_enc.c
+ ../../../3rdparty/libwebp/src/mux/anim_encode.c
+ ../../../3rdparty/libwebp/src/mux/muxedit.c
+ ../../../3rdparty/libwebp/src/mux/muxinternal.c
+ ../../../3rdparty/libwebp/src/mux/muxread.c
+ ../../../3rdparty/libwebp/src/utils/bit_reader_utils.c
+ ../../../3rdparty/libwebp/src/utils/bit_writer_utils.c
+ ../../../3rdparty/libwebp/src/utils/color_cache_utils.c
+ ../../../3rdparty/libwebp/src/utils/filters_utils.c
+ ../../../3rdparty/libwebp/src/utils/huffman_encode_utils.c
+ ../../../3rdparty/libwebp/src/utils/huffman_utils.c
+ ../../../3rdparty/libwebp/src/utils/quant_levels_dec_utils.c
+ ../../../3rdparty/libwebp/src/utils/quant_levels_utils.c
+ ../../../3rdparty/libwebp/src/utils/random_utils.c
+ ../../../3rdparty/libwebp/src/utils/rescaler_utils.c
+ ../../../3rdparty/libwebp/src/utils/thread_utils.c
+ ../../../3rdparty/libwebp/src/utils/utils.c
+ INCLUDE_DIRECTORIES
+ ../../../3rdparty/libwebp
+ ../../../3rdparty/libwebp/src
+ ../../../3rdparty/libwebp/src/dec
+ ../../../3rdparty/libwebp/src/dsp
+ ../../../3rdparty/libwebp/src/enc
+ ../../../3rdparty/libwebp/src/mux
+ ../../../3rdparty/libwebp/src/utils
+ ../../../3rdparty/libwebp/src/webp
+)
+
+qt_internal_extend_target(QWebpPlugin CONDITION ANDROID AND NOT
ANDROID_EMBEDDED AND NOT QT_FEATURE_system_webp
+ SOURCES
+ ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c #
special case
+ INCLUDE_DIRECTORIES
+ ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures #
special case
+)
+
+# special case begin
+qt_internal_extend_target(QWebpPlugin
+ CONDITION (CMAKE_ANDROID_ARM_NEON OR CMAKE_ANDROID_ARCH_ABI STREQUAL
"arm64-v8a")
+ AND NOT QT_FEATURE_system_webp
+ SOURCES
+ ../../../3rdparty/libwebp/src/dsp/alpha_processing_neon.c
+ ../../../3rdparty/libwebp/src/dsp/dec_neon.c
+ ../../../3rdparty/libwebp/src/dsp/enc_neon.c
+ ../../../3rdparty/libwebp/src/dsp/filters_neon.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_enc_neon.c
+ ../../../3rdparty/libwebp/src/dsp/lossless_neon.c
+ ../../../3rdparty/libwebp/src/dsp/rescaler_neon.c
+ ../../../3rdparty/libwebp/src/dsp/upsampling_neon.c
+ ../../../3rdparty/libwebp/src/dsp/yuv_neon.c
+)
+# special case end
+
+#### Keys ignored in scope
6:.:../../../3rdparty:../../../3rdparty/libwebp.pri:INTEGRITY:
+# QMAKE_CFLAGS = "-c99"
+
+#### Keys ignored in scope
12:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else:
+# QMAKE_EXTRA_COMPILERS = "neon_comp"
+# neon_comp.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$$QMAKE_CFLAGS_NEON"
"$(INCPATH)" "${QMAKE_FILE_IN}"
+# neon_comp.dependency_type = "TYPE_C"
+# neon_comp.input = "SOURCES_FOR_NEON"
+# neon_comp.name = "compiling[neon]" "${QMAKE_FILE_IN}"
+# neon_comp.output =
"${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
+# neon_comp.variable_out = "OBJECTS"
+
+#### Keys ignored in scope
13:.:../../../3rdparty:../../../3rdparty/libwebp.pri:MSVC:
+# neon_comp.commands = "-Fo${QMAKE_FILE_OUT}"
+
+#### Keys ignored in scope
14:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else:
+# neon_comp.commands = "-o" "${QMAKE_FILE_OUT}"
+
+#### Keys ignored in scope
15:.:../../../3rdparty:../../../3rdparty/libwebp.pri:silent:
+# neon_comp.commands = "@echo" "compiling[neon]" "${QMAKE_FILE_IN}" "&&"
