Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-shadertools for openSUSE:Factory
checked in at 2021-03-17 20:14:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-shadertools (Old)
and /work/SRC/openSUSE:Factory/.qt6-shadertools.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-shadertools"
Wed Mar 17 20:14:41 2021 rev:2 rq:878009 version:6.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-shadertools/qt6-shadertools.changes
2020-12-18 19:59:02.138039856 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-shadertools.new.2401/qt6-shadertools.changes
2021-03-17 20:18:50.327225983 +0100
@@ -1,0 +2,12 @@
+Tue Mar 9 13:34:47 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.0.2:
+ https://www.qt.io/blog/qt-6.0.2-released
+
+-------------------------------------------------------------------
+Wed Feb 3 17:27:22 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.0.1
+ https://www.qt.io/blog/qt-6.0.1-released
+
+-------------------------------------------------------------------
Old:
----
qtshadertools-everywhere-src-6.0.0.tar.xz
New:
----
qtshadertools-everywhere-src-6.0.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-shadertools.spec ++++++
--- /var/tmp/diff_new_pack.r0nyCA/_old 2021-03-17 20:18:53.375230149 +0100
+++ /var/tmp/diff_new_pack.r0nyCA/_new 2021-03-17 20:18:53.379230154 +0100
@@ -16,7 +16,7 @@
#
-%define real_version 6.0.0
+%define real_version 6.0.2
%define short_version 6.0
%define tar_name qtshadertools-everywhere-src
%define tar_suffix %{nil}
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-shadertools%{?pkg_suffix}
-Version: 6.0.0
+Version: 6.0.2
Release: 0
Summary: Qt 6 ShaderTools library
License: GPL-3.0-or-later
++++++ qtshadertools-everywhere-src-6.0.0.tar.xz ->
qtshadertools-everywhere-src-6.0.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT
new/qtshadertools-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT
--- old/qtshadertools-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT
2020-12-05 08:01:41.678986300 +0100
+++ new/qtshadertools-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT
2021-02-25 06:44:11.722212800 +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/qtshadertools-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
new/qtshadertools-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
---
old/qtshadertools-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
2020-12-05 08:01:41.674986400 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
2021-02-25 06:44:11.722212800 +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/qtshadertools-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
new/qtshadertools-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
--- old/qtshadertools-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
2020-12-05 08:01:41.674986400 +0100
+++ new/qtshadertools-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
2021-02-25 06:44:11.722212800 +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/qtshadertools-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
new/qtshadertools-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
---
old/qtshadertools-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
2020-12-05 08:01:41.678986300 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
2021-02-25 06:44:11.722212800 +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/qtshadertools-everywhere-src-6.0.0/.cmake.conf
new/qtshadertools-everywhere-src-6.0.2/.cmake.conf
--- old/qtshadertools-everywhere-src-6.0.0/.cmake.conf 2020-12-04
16:35:23.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.0.2/.cmake.conf 2021-02-25
00:54:22.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/qtshadertools-everywhere-src-6.0.0/.qmake.conf
new/qtshadertools-everywhere-src-6.0.2/.qmake.conf
--- old/qtshadertools-everywhere-src-6.0.0/.qmake.conf 2020-12-04
16:35:23.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.0.2/.qmake.conf 2021-02-25
00:54:22.000000000 +0100
@@ -3,4 +3,4 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 6.0.0
+MODULE_VERSION = 6.0.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.0.0/.tag
new/qtshadertools-everywhere-src-6.0.2/.tag
--- old/qtshadertools-everywhere-src-6.0.0/.tag 2020-12-04 16:35:23.000000000
+0100
+++ new/qtshadertools-everywhere-src-6.0.2/.tag 2021-02-25 00:54:22.000000000
+0100
@@ -1 +1 @@
-d3728dae58eca05bdac1f934ef981dd2bb6fa66a
+03ee874da27b88b46f06abd124d8a5345f028210
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.0.0/dependencies.yaml
new/qtshadertools-everywhere-src-6.0.2/dependencies.yaml
--- old/qtshadertools-everywhere-src-6.0.0/dependencies.yaml 2020-12-04
16:35:23.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.0.2/dependencies.yaml 2021-02-25
00:54:22.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/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qshaderbaker_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qshaderbaker_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qshaderbaker_p.h
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qshaderbaker_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qshaderbaker_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qshaderbatchablerewriter_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qshaderbatchablerewriter_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qshaderbatchablerewriter_p.h
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qshaderbatchablerewriter_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qshaderbatchablerewriter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvcompiler_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvcompiler_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvcompiler_p.h
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvcompiler_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qspirvcompiler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvshader_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvshader_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvshader_p.h
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvshader_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qspirvshader_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvshaderremap_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvshaderremap_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvshaderremap_p.h
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qspirvshaderremap_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qspirvshaderremap_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qtshadertoolsglobal_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qtshadertoolsglobal_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.0/QtShaderTools/private/qtshadertoolsglobal_p.h
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.0/QtShaderTools/private/qtshadertoolsglobal_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qtshadertoolsglobal_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qshaderbaker_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qshaderbaker_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qshaderbaker_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qshaderbaker_p.h
2021-02-25 00:54:22.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qshaderbaker_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qshaderbatchablerewriter_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qshaderbatchablerewriter_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qshaderbatchablerewriter_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qshaderbatchablerewriter_p.h
2021-02-25 00:54:22.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qshaderbatchablerewriter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvcompiler_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvcompiler_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvcompiler_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvcompiler_p.h
2021-02-25 00:54:22.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qspirvcompiler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvshader_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvshader_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvshader_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvshader_p.h
2021-02-25 00:54:22.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qspirvshader_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvshaderremap_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvshaderremap_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvshaderremap_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qspirvshaderremap_p.h
2021-02-25 00:54:22.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qspirvshaderremap_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qtshadertoolsglobal_p.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qtshadertoolsglobal_p.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/6.0.2/QtShaderTools/private/qtshadertoolsglobal_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/6.0.2/QtShaderTools/private/qtshadertoolsglobal_p.h
2021-02-25 00:54:22.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qtshadertoolsglobal_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/qtshadertoolsversion.h
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/qtshadertoolsversion.h
---
old/qtshadertools-everywhere-src-6.0.0/include/QtShaderTools/qtshadertoolsversion.h
2020-12-05 08:01:41.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/include/QtShaderTools/qtshadertoolsversion.h
2021-02-25 06:44:11.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTSHADERTOOLS_VERSION_H
#define QT_QTSHADERTOOLS_VERSION_H
-#define QTSHADERTOOLS_VERSION_STR "6.0.0"
+#define QTSHADERTOOLS_VERSION_STR "6.0.2"
-#define QTSHADERTOOLS_VERSION 0x060000
+#define QTSHADERTOOLS_VERSION 0x060002
#endif // QT_QTSHADERTOOLS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/SPIRV-Cross/COPYRIGHT.txt
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/SPIRV-Cross/COPYRIGHT.txt
---
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/SPIRV-Cross/COPYRIGHT.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/SPIRV-Cross/COPYRIGHT.txt
2021-02-25 00:54:22.000000000 +0100
@@ -0,0 +1,6 @@
+Copyright 2015-2020 Arm Limited
+Copyright (c) 2014-2019 The Khronos Group Inc.
+Copyright 2019-2020 Hans-Kristian Arntzen
+Copyright 2016-2020 Robert Konrad
+Copyright 2016-2020 The Brenwill Workshop Ltd.
+Copyright 2018-2020 Bradley Austin Davis
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/SPIRV-Cross/KHRONOS-LICENSE.txt
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/SPIRV-Cross/KHRONOS-LICENSE.txt
---
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/SPIRV-Cross/KHRONOS-LICENSE.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/SPIRV-Cross/KHRONOS-LICENSE.txt
2021-02-25 00:54:22.000000000 +0100
@@ -0,0 +1,23 @@
+Copyright (c) 2014-2019 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/SPIRV-Cross/qt_attribution.json
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/SPIRV-Cross/qt_attribution.json
---
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/SPIRV-Cross/qt_attribution.json
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/SPIRV-Cross/qt_attribution.json
2021-02-25 00:54:22.000000000 +0100
@@ -8,9 +8,12 @@
"Homepage": "https://github.com/KhronosGroup/SPIRV-Cross";,
"Version": "c5f7b55756886a2e78cbc2e7a40e8091e17f6310",
- "License": "Apache License 2.0",
- "LicenseId": "Apache-2.0",
- "LicenseFile": "LICENSE",
- "Copyright": "Copyright 2015-2020 ARM Limited"
+ "License": "Apache License 2.0 and Khronos License",
+ "LicenseId": "Apache-2.0 AND urn:dje:license:khronos",
+ "LicenseFiles": [
+ "LICENSE",
+ "KHRONOS-LICENSE.txt"
+ ],
+ "CopyrightFile": "COPYRIGHT.txt"
}
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/glslang/COPYRIGHT.txt
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/glslang/COPYRIGHT.txt
--- old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/glslang/COPYRIGHT.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/glslang/COPYRIGHT.txt
2021-02-25 00:54:22.000000000 +0100
@@ -0,0 +1,7 @@
+Copyright (c) 2017, 2019 ARM Limited
+Copyright (c) 2002-2005 3 Dlabs Inc. Ltd.
+Copyright (c) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+Copyright (c) 2014-2018 Google, Inc.
+Copyright (c) 2002 NVIDIA Corporation
+Copyright (c) 2002-2010 The ANGLE Project
+Copyright (c) 2014-2019 The Khronos Group Inc.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/glslang/LICENSE.txt
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/glslang/LICENSE.txt
--- old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/glslang/LICENSE.txt
2020-12-04 16:35:23.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/glslang/LICENSE.txt
2021-02-25 00:54:22.000000000 +0100
@@ -1,6 +1,6 @@
Here, glslang proper means core GLSL parsing, HLSL parsing, and SPIR-V code
-generation. Glslang proper requires use of two licenses, one that covers
-non-preprocessing and an additional one that covers preprocessing.
+generation. Glslang proper requires use of a number of licenses, one that
covers
+preprocessing and others that covers non-preprocessing.
Bison was removed long ago. You can build glslang from the source grammar,
using tools of your choice, without using bison or any bison files.
@@ -23,8 +23,12 @@
The core of glslang-proper, minus the preprocessor is licenced as follows:
+--------------------------------------------------------------------------------
+3-Clause BSD License
+--------------------------------------------------------------------------------
+
//
-// Copyright (C) 2015-2018 Google, Inc.
+// Copyright (C) 2014-2018 Google, Inc.
// Copyright (C) <various other dates and companies>
//
// All rights reserved.
@@ -59,11 +63,282 @@
// POSSIBILITY OF SUCH DAMAGE.
//
+
+--------------------------------------------------------------------------------
+Khronos License
+--------------------------------------------------------------------------------
+
+// Copyright (c) 2014-2019 The Khronos Group Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and/or associated documentation files (the "Materials"),
+// to deal in the Materials without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Materials, and to permit persons to whom the
+// Materials are furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Materials.
+//
+// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+//
+// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+// IN THE MATERIALS.
+
+--------------------------------------------------------------------------------
+APACHE LICENSE, VERSION 2.0
+--------------------------------------------------------------------------------
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+--------------------------------------------------------------------------------
+GPL 3 with special bison exception
+--------------------------------------------------------------------------------
+
+ Bison implementation for Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison.
+
+--------------------------------------------------------------------------------
+================================================================================
--------------------------------------------------------------------------------
-The preprocessor has the core license stated above, plus an additional licence:
+The preprocessor has the core licenses stated above, plus an additional
licence:
-/****************************************************************************\
Copyright (c) 2002, NVIDIA Corporation.
NVIDIA Corporation("NVIDIA") supplies this software to you in
@@ -105,4 +380,3 @@
NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/glslang/qt_attribution.json
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/glslang/qt_attribution.json
---
old/qtshadertools-everywhere-src-6.0.0/src/3rdparty/glslang/qt_attribution.json
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/src/3rdparty/glslang/qt_attribution.json
2021-02-25 00:54:22.000000000 +0100
@@ -8,9 +8,9 @@
"Homepage": "https://github.com/KhronosGroup/glslang";,
"Version": "07e1a0a67aee5b21561bd6b93d73c8d87e010d98",
- "License": "BSD License",
- "LicenseId": "BSD",
+ "License": "BSD 3-Clause \"New\" or \"Revised\" License, and Khronos
License, and Apache License 2.0, and GNU General Public License v3.0 or later
with Bison exception 2.2, and NVIDIA 2002 License",
+ "LicenseId": "BSD-3-Clause AND urn:dje:license:khronos AND Apache-2.0
AND GPL-3.0-or-later WITH bison-exception-2.12 AND urn:dje:license:nvidia-2002",
"LicenseFile": "LICENSE.txt",
- "Copyright": "Copyright (C) 2002-2005 3Dlabs Inc. Ltd. Copyright (C)
2012-2014 LunarG, Inc. Copyright (C) 2002-2010 The ANGLE Project Authors.
Copyright (C) 2015-2016 Google, Inc."
+ "CopyrightFile": "COPYRIGHT.txt"
}
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/src/shadertools/doc/src/qtshadertools-build.qdoc
new/qtshadertools-everywhere-src-6.0.2/src/shadertools/doc/src/qtshadertools-build.qdoc
---
old/qtshadertools-everywhere-src-6.0.0/src/shadertools/doc/src/qtshadertools-build.qdoc
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/src/shadertools/doc/src/qtshadertools-build.qdoc
2021-02-25 00:54:22.000000000 +0100
@@ -35,7 +35,7 @@
useful functions applications can take into use in their
\c{CMakeLists.txt}.
When using the \c{qt6_add_shaders} function, the \l{QSB Manual}{qsb} tool
- will get invokved automatically by the build system, and the resulting
+ will get invoked automatically by the build system, and the resulting
\c{.qsb} files get added to the resource system implicitly.
\section1 First Example
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/src/shadertools/doc/src/qtshadertools-copyright.qdoc
new/qtshadertools-everywhere-src-6.0.2/src/shadertools/doc/src/qtshadertools-copyright.qdoc
---
old/qtshadertools-everywhere-src-6.0.0/src/shadertools/doc/src/qtshadertools-copyright.qdoc
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/src/shadertools/doc/src/qtshadertools-copyright.qdoc
1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Shader Tools module
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\page copyright-notices.html
-\title Copyright Notices
-\section1 Third-party Licenses
-
-The following table lists parts (modules) of Qt Shader Tools that
-incorporate code licensed under third-party open-source licenses:
-
-\annotatedlist attributions-qtshadertools
-*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.0.0/src/shadertools/doc/src/qtshadertools-index.qdoc
new/qtshadertools-everywhere-src-6.0.2/src/shadertools/doc/src/qtshadertools-index.qdoc
---
old/qtshadertools-everywhere-src-6.0.0/src/shadertools/doc/src/qtshadertools-index.qdoc
2020-12-04 16:35:23.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.0.2/src/shadertools/doc/src/qtshadertools-index.qdoc
2021-02-25 00:54:22.000000000 +0100
@@ -131,13 +131,24 @@
directly with the \c qsb tool since it is encapsulated by the Qt Quick 3D's own
framework and tools.
-\section1 Table of Contents
+\section1 Licenses and Attributions
+
+Qt Shader Tools is available under commercial licenses from \l{The Qt Company}.
+In addition, it is available under the
+\l{GNU General Public License, version 3}.
+See \l{Qt Licensing} for further details.
+
+Furthermore, Qt Shader Tools in \QtVersion may contain third party
+modules under following permissive licenses:
+
+\generatelist{groupsbymodule attributions-qtshadertools}
+
+\section1 Guides and Other Information
\list
\li \l {QSB Manual}
\li \l {Qt Shader Tools Build System Integration}
\li \l {Qt Shader Tools C++ Classes}
- \li \l {Copyright Notices}
\endlist
*/
