Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-quicktimeline for
openSUSE:Factory checked in at 2021-03-17 20:14:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-quicktimeline (Old)
and /work/SRC/openSUSE:Factory/.qt6-quicktimeline.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-quicktimeline"
Wed Mar 17 20:14:43 2021 rev:2 rq:878010 version:6.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-quicktimeline/qt6-quicktimeline.changes
2021-01-10 19:46:15.242086361 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-quicktimeline.new.2401/qt6-quicktimeline.changes
2021-03-17 20:18:53.911230882 +0100
@@ -1,0 +2,12 @@
+Tue Mar 9 13:34:21 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:25:04 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.0.1
+ https://www.qt.io/blog/qt-6.0.1-released
+
+-------------------------------------------------------------------
Old:
----
qtquicktimeline-everywhere-src-6.0.0.tar.xz
New:
----
qtquicktimeline-everywhere-src-6.0.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-quicktimeline.spec ++++++
--- /var/tmp/diff_new_pack.xlV8ej/_old 2021-03-17 20:18:54.719231986 +0100
+++ /var/tmp/diff_new_pack.xlV8ej/_new 2021-03-17 20:18:54.723231992 +0100
@@ -1,7 +1,7 @@
#
# spec file for package qt6-quicktimeline
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
-%define real_version 6.0.0
+%define real_version 6.0.2
%define short_version 6.0
%define tar_name qtquicktimeline-everywhere-src
%define tar_suffix %{nil}
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-quicktimeline%{?pkg_suffix}
-Version: 6.0.0
+Version: 6.0.2
Release: 0
Summary: Qt6 QuickTimeline plugin
License: GPL-3.0-or-later
++++++ qtquicktimeline-everywhere-src-6.0.0.tar.xz ->
qtquicktimeline-everywhere-src-6.0.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT
new/qtquicktimeline-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT
--- old/qtquicktimeline-everywhere-src-6.0.0/.QT-ENTERPRISE-LICENSE-AGREEMENT
2020-12-05 08:01:41.514986300 +0100
+++ new/qtquicktimeline-everywhere-src-6.0.2/.QT-ENTERPRISE-LICENSE-AGREEMENT
2021-02-25 06:44:11.554212800 +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/qtquicktimeline-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
new/qtquicktimeline-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
---
old/qtquicktimeline-everywhere-src-6.0.0/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
2020-12-05 08:01:41.514986300 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT
2021-02-25 06:44:11.550212900 +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/qtquicktimeline-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
new/qtquicktimeline-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
---
old/qtquicktimeline-everywhere-src-6.0.0/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
2020-12-05 08:01:41.514986300 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
2021-02-25 06:44:11.550212900 +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/qtquicktimeline-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
new/qtquicktimeline-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
---
old/qtquicktimeline-everywhere-src-6.0.0/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
2020-12-05 08:01:41.514986300 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT
2021-02-25 06:44:11.554212800 +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/qtquicktimeline-everywhere-src-6.0.0/.cmake.conf
new/qtquicktimeline-everywhere-src-6.0.2/.cmake.conf
--- old/qtquicktimeline-everywhere-src-6.0.0/.cmake.conf 2020-12-04
19:41:14.000000000 +0100
+++ new/qtquicktimeline-everywhere-src-6.0.2/.cmake.conf 2021-02-25
03:26:55.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/qtquicktimeline-everywhere-src-6.0.0/.qmake.conf
new/qtquicktimeline-everywhere-src-6.0.2/.qmake.conf
--- old/qtquicktimeline-everywhere-src-6.0.0/.qmake.conf 2020-12-04
19:41:14.000000000 +0100
+++ new/qtquicktimeline-everywhere-src-6.0.2/.qmake.conf 2021-02-25
03:26:55.000000000 +0100
@@ -2,6 +2,6 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 6.0.0
+MODULE_VERSION = 6.0.2
CMAKE_MODULE_TESTS = -
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtquicktimeline-everywhere-src-6.0.0/.tag
new/qtquicktimeline-everywhere-src-6.0.2/.tag
--- old/qtquicktimeline-everywhere-src-6.0.0/.tag 2020-12-04
19:41:14.000000000 +0100
+++ new/qtquicktimeline-everywhere-src-6.0.2/.tag 2021-02-25
03:26:55.000000000 +0100
@@ -1 +1 @@
-3ca11a6edc751e7c413cd9e149dfc4dfe56b8981
+b3ff9f762e2884d637fdb3a24ecadfbcadde2e68
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/dependencies.yaml
new/qtquicktimeline-everywhere-src-6.0.2/dependencies.yaml
--- old/qtquicktimeline-everywhere-src-6.0.0/dependencies.yaml 2020-12-04
19:41:14.000000000 +0100
+++ new/qtquicktimeline-everywhere-src-6.0.2/dependencies.yaml 2021-02-25
03:26:55.000000000 +0100
@@ -1,7 +1,7 @@
dependencies:
../qtbase:
- ref: fc9cda5f08ac848e88f63dd4a07c08b2fbc6bf17
+ ref: 723077eb3529810aa3b99d8c06f9b81a586763c9
required: true
../qtdeclarative:
- ref: fa87052d56526e1529e694fb1c69c69eec38f2fd
+ ref: da46b97ed5a56ce3db8e903053dd10bb9b7d2904
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/keyframedatautils_p.h
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/keyframedatautils_p.h
---
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/keyframedatautils_p.h
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/keyframedatautils_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/imports/timeline/keyframedatautils_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquickkeyframe_p.h
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquickkeyframe_p.h
---
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquickkeyframe_p.h
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquickkeyframe_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/imports/timeline/qquickkeyframe_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquicktimeline_p.h
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquicktimeline_p.h
---
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquicktimeline_p.h
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquicktimeline_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/imports/timeline/qquicktimeline_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquicktimelineanimation_p.h
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquicktimelineanimation_p.h
---
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquicktimelineanimation_p.h
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.0/QtQuickTimeline/private/qquicktimelineanimation_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/imports/timeline/qquicktimelineanimation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/keyframedatautils_p.h
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/keyframedatautils_p.h
---
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/keyframedatautils_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/keyframedatautils_p.h
2021-02-25 03:26:55.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/imports/timeline/keyframedatautils_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquickkeyframe_p.h
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquickkeyframe_p.h
---
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquickkeyframe_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquickkeyframe_p.h
2021-02-25 03:26:55.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/imports/timeline/qquickkeyframe_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquicktimeline_p.h
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquicktimeline_p.h
---
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquicktimeline_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquicktimeline_p.h
2021-02-25 03:26:55.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/imports/timeline/qquicktimeline_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquicktimelineanimation_p.h
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquicktimelineanimation_p.h
---
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquicktimelineanimation_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/6.0.2/QtQuickTimeline/private/qquicktimelineanimation_p.h
2021-02-25 03:26:55.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/imports/timeline/qquicktimelineanimation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/qtquicktimelineversion.h
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/qtquicktimelineversion.h
---
old/qtquicktimeline-everywhere-src-6.0.0/include/QtQuickTimeline/qtquicktimelineversion.h
2020-12-05 08:01:41.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/include/QtQuickTimeline/qtquicktimelineversion.h
2021-02-25 06:44:11.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTQUICKTIMELINE_VERSION_H
#define QT_QTQUICKTIMELINE_VERSION_H
-#define QTQUICKTIMELINE_VERSION_STR "6.0.0"
+#define QTQUICKTIMELINE_VERSION_STR "6.0.2"
-#define QTQUICKTIMELINE_VERSION 0x060000
+#define QTQUICKTIMELINE_VERSION 0x060002
#endif // QT_QTQUICKTIMELINE_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/doc/qtquicktimeline.qdocconf
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/doc/qtquicktimeline.qdocconf
---
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/doc/qtquicktimeline.qdocconf
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/doc/qtquicktimeline.qdocconf
2021-02-25 03:26:55.000000000 +0100
@@ -35,7 +35,7 @@
#exampledirs =
imagedirs += images \
-depends += qtcore qtdoc qtquick
+depends += qtcore qtdoc qtqml qtquick
tagfile = qtquicktimeline.tags
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/doc/src/qtquicktimeline-module-qml.qdoc
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/doc/src/qtquicktimeline-module-qml.qdoc
---
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/doc/src/qtquicktimeline-module-qml.qdoc
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/doc/src/qtquicktimeline-module-qml.qdoc
2021-02-25 03:26:55.000000000 +0100
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -36,6 +36,6 @@
statement in your .qml file:
\qml
- import QtQuick.Timeline 1.0
+ import QtQuick.Timeline
\endqml
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/keyframedatautils_p.h
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/keyframedatautils_p.h
---
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/keyframedatautils_p.h
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/keyframedatautils_p.h
2021-02-25 03:26:55.000000000 +0100
@@ -231,8 +231,8 @@
// Write QVariant value into CBOR in correct type.
void writeValue(QCborStreamWriter &writer, const QVariant &value)
{
- QMetaType::Type type = static_cast<QMetaType::Type>(value.type());
- switch (type) {
+ const QMetaType type = value.metaType();
+ switch (type.id()) {
case QMetaType::Bool: {
bool b = value.toBool();
writer.append(b);
@@ -299,7 +299,7 @@
break;
}
default: {
- qDebug() << "Not able to add:" << value << "of type:" << type;
+ qDebug() << "Not able to add:" << value << "of type:" << type.name();
qDebug() << "Please add support for this type into generator.";
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/qquickkeyframe.cpp
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/qquickkeyframe.cpp
---
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/qquickkeyframe.cpp
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/qquickkeyframe.cpp
2021-02-25 03:26:55.000000000 +0100
@@ -183,7 +183,7 @@
/*!
\qmltype Keyframe
- \inherits QObject
+ \inherits QtObject
\instantiates QQuickKeyframe
\inqmlmodule QtQuick.Timeline
\ingroup qtqmltypes
@@ -257,7 +257,7 @@
/*!
\qmltype KeyframeGroup
- \inherits QObject
+ \inherits QtObject
\instantiates QQuickKeyframeGroup
\inqmlmodule QtQuick.Timeline
\ingroup qtqmltypes
@@ -517,9 +517,10 @@
qreal progress = easing().valueForProgress(offset / duration);
- preValue.convert(userType);
+ const QMetaType targetType(userType);
+ preValue.convert(targetType);
QVariant convertedValue = value();
- convertedValue.convert(userType);
+ convertedValue.convert(targetType);
if (!interpolator) {
if (progress < 1.0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/qquicktimeline.cpp
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/qquicktimeline.cpp
---
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/qquicktimeline.cpp
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/qquicktimeline.cpp
2021-02-25 03:26:55.000000000 +0100
@@ -139,7 +139,7 @@
/*!
\qmltype Timeline
- \inherits QObject
+ \inherits QtObject
\instantiates QQuickTimeline
\inqmlmodule QtQuick.Timeline
\ingroup qtqmltypes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/qquicktimelineanimation.cpp
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/qquicktimelineanimation.cpp
---
old/qtquicktimeline-everywhere-src-6.0.0/src/imports/timeline/qquicktimelineanimation.cpp
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/src/imports/timeline/qquicktimelineanimation.cpp
2021-02-25 03:26:55.000000000 +0100
@@ -40,7 +40,7 @@
/*!
\qmltype TimelineAnimation
- \inherits QQuickNumberAnimation
+ \inherits NumberAnimation
\instantiates QQuickTimelineAnimation
\inqmlmodule QtQuick.Timeline
\ingroup qtqmltypes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquicktimeline-everywhere-src-6.0.0/tests/manual/timelineTestApp/main.cpp
new/qtquicktimeline-everywhere-src-6.0.2/tests/manual/timelineTestApp/main.cpp
---
old/qtquicktimeline-everywhere-src-6.0.0/tests/manual/timelineTestApp/main.cpp
2020-12-04 19:41:14.000000000 +0100
+++
new/qtquicktimeline-everywhere-src-6.0.2/tests/manual/timelineTestApp/main.cpp
2021-02-25 03:26:55.000000000 +0100
@@ -1,7 +1,7 @@
/******************************************************************************
**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Quick Timeline module of the Qt Toolkit.
**
@@ -12,8 +12,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** $QT_END_LICENSE$
**
