73 files changed, 1204 insertions, 1409 deletions

diff --git a/licenses/The-Qt-Company-Commercial b/licenses/The-Qt-Company-Commercial
index 7be8fb5d..19a20ea4 100644
--- a/licenses/The-Qt-Company-Commercial
+++ b/licenses/The-Qt-Company-Commercial
@@ -1,6 +1,7 @@
-QT LICENSE AGREEMENT Agreement version 4.2
+QT LICENSE AGREEMENT
+Agreement version 4.2.1
 
-This Qt License Agreement (“Agreement”) is a legal agreement for the licensing
+This Qt License Agreement ("Agreement") is a legal agreement for the licensing
 of Licensed Software (as defined below) between The Qt Company (as defined
 below) and the Licensee who has accepted the terms of this Agreement by
 downloading or using the Licensed Software and/or as defined herein:
@@ -17,283 +18,276 @@ WHEREAS:
 
 NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS:
 
-
 1. DEFINITIONS
-
-“Affiliate” of a Party shall mean an entity (i) which is directly
-or indirectly controlling such Party; (ii) which is under the same direct or
-indirect ownership or control as such Party; or (iii) which is directly or
-indirectly owned or controlled by such Party.  For these purposes, an entity
-shall be treated as being controlled by another if that other entity has fifty
-percent (50 %) or more of the votes in such entity, is able to direct its
-affairs and/or to control the composition of its board of directors or
-equivalent body.
-
-“Add-on Products” shall mean The Qt Company’s specific add-on software products
-(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which
-are not licensed as part of The Qt Company’s standard offering, but shall be
-included into the scope of Licensed Software only if so specifically agreed
+"Affiliate" of a Party shall mean an entity (i) which is directly or indirectly
+controlling such Party; (ii) which is under the same direct or indirect
+ownership or control as such Party; or (iii) which is directly or indirectly
+owned or controlled by such Party.  For these purposes, an entity shall be
+treated as being controlled by another if that other entity has fifty percent
+(50 %) or more of the votes in such entity, is able to direct its affairs
+and/or to control the composition of its board of directors or equivalent body.
+
+"Add-on Products" shall mean The Qt Company's specific add-on software products
+(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager),
+which are not licensed as part of The Qt Company's standard offering, but shall
+be included into the scope of Licensed Software only if so specifically agreed
 between the Parties.
 
-“Applications” shall mean Licensee's software products created using the
+"Applications" shall mean Licensee's software products created using the
 Licensed Software, which may include the Redistributables, or part thereof.
 
-“Contractor(s)” shall mean third party consultants, distributors and contractors
-performing services to the Licensee under applicable contractual arrangement.
+"Contractor(s)" shall mean third party consultants, distributors and
+contractors performing services to the Licensee under applicable contractual
+arrangement.
 
-“Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or
+"Customer(s)" shall mean Licensee's end users to whom Licensee, directly or
 indirectly, distributes copies of the Redistributables.
 
-“Data Protection Legislation” shall mean the General Data Protection Regulation
+"Data Protection Legislation" shall mean the General Data Protection Regulation
 (EU 2016/679) (GDPR) and any national implementing laws, regulations and
 secondary legislation, as may be amended or updated from time to time, as well
 as any other data protection laws or regulations applicable in relevant
 territory.
 
-“Deployment Platforms” shall mean operating systems specified in the License
-Certificate, on which the Redistributables can be distributed pursuant to the
-terms and conditions of this Agreement.
+"Deployment Platforms" shall mean operating systems and/or hardware specified
+in the License Certificate, on which the Redistributables can be distributed
+pursuant to the terms and conditions of this Agreement.
 
-“Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s
-Affiliates acting within the scope of their employment or Licensee's Contractors
-acting within the scope of their services for Licensee and on behalf of
-Licensee. Designated Users shall be named in the License Certificate.
+"Designated User(s)" shall mean the employee(s) of Licensee or Licensee's
+Affiliates acting within the scope of their employment or Licensee's
+Contractors acting within the scope of their services for Licensee and on
+behalf of Licensee. Designated Users shall be named in the License Certificate.
 
-“Development License” shall mean the license needed by the Licensee for each
+"Development License" shall mean the license needed by the Licensee for each
 Designated User to use the Licensed Software under the license grant described
-in Section 3.1 of this Agreement.  Development Licenses are available separately
-for Qt for Application Development and Qt for Device Creation products, each
-product having its designated scope and purpose of use.  Distribution Licenses
-are always connected to Qt for Device Creation product only.
+in Section 3.1 of this Agreement. Development Licenses are available
+separately for Qt for Application Development and Qt for Device Creation
+products, each product having its designated scope and purpose of use.
+Distribution Licenses are always connected to Qt for Device Creation
+product only.
 
-“Development Platforms” shall mean those operating systems specified in the
+"Development Platforms" shall mean those operating systems specified in the
 License Certificate, in which the Licensed Software can be used under the
 Development License, but not distributed in any form or used for any other
 purpose.
 
-“Devices” shall mean hardware devices or products that 1) are manufactured
-and/or distributed by the Licensee or its Affiliates or Contractors, and (2)(i)
-incorporate or integrate the Redistributables or parts thereof; or (ii) where
-the main user interface or substantial functionality of such unit , when used by
-a Customer, is provided by Application(s) or otherwise depends on the Licensed
-Software, regardless of whether the Redistributables are distributed together
-with the hardware or not. Devices covered with this Agreement shall be specified
-in Appendix 2 or in a quote.
+"Devices" shall mean hardware devices or products that 1) are manufactured
+and/or distributed by the Licensee or its Affiliates or Contractors, and
+(2)(i) incorporate or integrate the Redistributables or parts thereof; or (ii)
+where the main user interface or substantial functionality of such unit , when
+used by a Customer, is provided by Application(s) or otherwise depends on the
+Licensed Software, regardless of whether the Redistributables are distributed
+together with the hardware or not. Devices covered with this Agreement shall
+be specified in Appendix 2 or in a quote.
 
-“Distribution License(s)” shall mean the license required for any kind of sale,
+"Distribution License(s)" shall mean the license required for any kind of sale,
 trade, exchange, loan, lease, rental or other distribution by or on behalf of
 Licensee to a third party of Redistributables in connection with Devices
 pursuant to license grant described in Section 3.3 of this Agreement.
 
-“Distribution License Packs” shall mean set of prepaid Distribution Licenses for
-distribution of Redistributables, as defined in The Qt Company’s standard price
-list, quote, Purchase Order confirmation or in an appendix hereto, as the case
-may be.
+"Distribution License Packs" shall mean set of prepaid Distribution Licenses
+for distribution of Redistributables, as defined in The Qt Company's standard
+price list, quote, Purchase Order confirmation or in an appendix hereto, as
+the case may be.
 
-“Intellectual Property Rights” shall mean patents (including utility models),
+"Intellectual Property Rights" shall mean patents (including utility models),
 design patents, and designs (whether or not capable of registration), chip
 topography rights and other like protection, copyrights, trademarks, service
 marks, trade names, logos or other words or symbols and any other form of
 statutory protection of any kind and applications for any of the foregoing as
 well as any trade secrets.
 
-“License Certificate” shall mean a certificate generated by The Qt Company for
+"License Certificate" shall mean a certificate generated by The Qt Company for
 each Designated User respectively upon them downloading the Licensed Software,
-which will be available under respective Designated User’s Qt Account at
+which will be available under respective Designated User's Qt Account at
 account.qt.io. License Certificates will specify the Designated User, the
-Development Platforms, Deployment Platforms and the License Term. Such terms are
-considered part of the licenses granted hereunder and shall be updated from time
-to time to reflect any agreed changes to the foregoing terms relating to
-Designated User’s rights to the Licensed Software.
+Development Platforms, Deployment Platforms and the License Term. Such terms
+are considered part of the licenses granted hereunder and shall be updated
+from time to time to reflect any agreed changes to the foregoing terms
+relating to Designated User's rights to the Licensed Software.
 
-“License Fee” shall mean the fee charged to the Licensee for rights granted
+"License Fee" shall mean the fee charged to the Licensee for rights granted
 under the terms of this Agreement.
 
-“License Term” shall mean the agreed validity period of the Development License
+"License Term" shall mean the agreed validity period of the Development License
 of the respective Designated User, during which time the Designated User is
 entitled to use the Licensed Software, as set forth in the respective License
 Certificate.
 
-“Licensed Software” shall mean either
-   (i)   Qt for Application Development or
-   (ii)  Qt for Device Creation, and/or
-   (iii) Qt 3D Studio, and/or
-   (iv)  Qt Design Studio, and/or
-   (v)   selected Add-on Products, if any,
+"Licensed Software" shall mean either
+    (i)     Qt for Application Development or
+    (ii)    Qt for Device Creation, and/or
+    (iii)   Qt 3D Studio, and/or
+    (iv)    Qt Design Studio, and/or
+    (v)     Qt for MCUs, and/or
+    (vi)    selected Add-on Products, if any,
 
 depending on which product(s) the Licensee has purchased under this Agreement,
 as well as corresponding online or electronic documentation, associated media
-and printed materials, including the source code, example programs and the
-documentation, licensed to the Licensee under this Agreement. Licensed Software
-does not include Third Party Software (as defined in Section 4) or Open Source
-Qt. The Qt Company may, in the course of its development activities, at its free
-and absolute discretion and without any obligation to send or publish any
-notifications to the Licensee or in general, make changes, additions or
-deletions in the components and functionalities of the Licensed Software,
-provided that no such changes, additions or deletions will affect the already
-released version of the Licensed Software, but only upcoming version(s).
-
-“Licensee” shall mean the individual or legal entity that is party to this
+and printed materials, including the source code (where applicable), example
+programs and the documentation, licensed to the Licensee under this Agreement.
+Licensed Software does not include Third Party Software (as defined in Section
+4) or Open Source Qt. The Qt Company may, in the course of its development
+activities, at its free and absolute discretion and without any obligation to
+send or publish any notifications to the Licensee or in general, make changes,
+additions or deletions in the components and functionalities of the Licensed
+Software, provided that no such changes, additions or deletions will affect
+the already released version of the Licensed Software, but only upcoming
+version(s).
+
+"Licensee" shall mean the individual or legal entity that is party to this
 Agreement, as identified on the signature page hereof.
 
-“Licensee’s Records” shall mean books and records that are likely to contain
-information bearing on Licensee’s compliance with this Agreement, Licensee’s use
-of Open Source Qt and/or the payments due to The Qt Company under this
-Agreement, including, but not limited to user information, assembly logs, sales
-records and distribution records.
+"Licensee's Records" shall mean books and records that are likely to contain
+information bearing on Licensee's compliance with this Agreement, Licensee's
+use of Open Source Qt and/or the payments due to The Qt Company under this
+Agreement, including, but not limited to user information, assembly logs,
+sales records and distribution records.
 
-“Modified Software” shall have the meaning as set forth in Section 2.3.
+"Modified Software" shall have the meaning as set forth in Section 2.3.
 
-“Online Services” shall mean any services or access to systems made available by
-The Qt Company to the Licensee over the Internet relating to the Licensed
+"Online Services" shall mean any services or access to systems made available
+by The Qt Company to the Licensee over the Internet relating to the Licensed
 Software or for the purpose of use by the Licensee of the Licensed Software or
 Support. Use of any such Online Services is discretionary for the Licensee and
 some of them may be subject to additional fees.
 
-“Open Source Qt” shall mean the non-commercial Qt computer software products,
+"Open Source Qt" shall mean the non-commercial Qt computer software products,
 licensed under the terms of the GNU Lesser General Public License, version 2.1
-or later (“LGPL”) or the GNU General Public License, version 2.0 or later
-(“GPL”). For clarity, Open Source Qt shall not be provided nor governed under
+or later ("LGPL") or the GNU General Public License, version 2.0 or later
+("GPL"). For clarity, Open Source Qt shall not be provided nor governed under
 this Agreement.
 
-”Party” or “Parties” shall mean Licensee and/or The Qt Company.
+"Party" or "Parties" shall mean Licensee and/or The Qt Company.
 
-“Permitted Combination” shall have the meaning as set forth in Section
+"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.
+"Pre-Release Code" shall have the meaning as set forth in Section 4.
 
-“Prohibited Combination” shall mean any means to (i) use, combine, incorporate,
+"Prohibited Combination" shall mean any means to (i) use, combine, incorporate,
 link or integrate Licensed Software with any software created with or
 incorporating Open Source Qt, (ii) use Licensed Software for creation of any
 software created with or incorporating Open Source Qt, or (iii) incorporate or
 integrate Applications into a hardware device or product other than a Device.
 
-“Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D
-user interface design and development environment for rapid designing and
-prototyping of animated user interfaces.
+"Qt 3D Studio" shall mean The Qt Company's productized offering, which consist
+of all versions of modules and tools as set forth in Appendix 1.
 
-“Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio
-tool, a user interface design and development environment for rapid designing
-and prototyping of animated user interfaces.
+"Qt Design Studio" shall mean The Qt Company's productized offering, which
+consist of all versions of modules and tools as set forth in Appendix 1.
 
-“Qt for Application Development” shall mean The Qt Company’s productized
-offering, which consist of all versions of
-   (i)   Qt Toolkit, and
-   (ii)  Qt Tools/Applications.
+"Qt for Application Development" shall mean The Qt Company's productized
+offering, which consist of all versions of modules and tools as set forth in
+Appendix 1.
 
-“Qt for Device Creation” shall mean The Qt Company’s productized offering, which
-consist of all versions of
-   (i)   Qt for Application Development, and
-   (ii)  Software components specific to embedded software development as set
-         forth in Appendix 1, Sections 1b and 1d.
+"Qt for Device Creation" shall mean The Qt Company's productized offering,
+which consist of all versions of modules and tools as set forth in Appendix 1.
 
-“Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a.
+"Qt for MCUs" shall mean The Qt Company's productized offering, which consist
+of all versions of modules and tools as set forth in Appendix 1.
 
-“Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c.
+"Redistributables" shall mean the portions of the Licensed Software set forth
+in Appendix 1 that may be distributed pursuant to the terms of this Agreement
+in object code form only, including any relevant documentation. Where
+relevant, any reference to Licensed Software in this Agreement shall include
+and refer also to Redistributables.
 
-"Redistributables" shall mean the portions of the Licensed Software set forth in
-Appendix 1, Section 2 that may be distributed pursuant to the terms of this
-Agreement in object code form only, including any relevant documentation. Where
-relevant, any reference to Licensed Software in this Agreement shall include and
-refer also to Redistributables.
-
-“Renewal Term” shall mean an extension of previous License Term as agreed
+"Renewal Term" shall mean an extension of previous License Term as agreed
 between the Parties.
 
-“Submitted Modified Software” shall have the meaning as set forth in Section
-2.3.
+"Submitted Modified Software" shall have the meaning as set forth in
+Section 2.3.
 
-“Support” shall mean standard developer support that is provided by The Qt
-Company to assist Designated Users in using the Licensed Software in accordance
-with The Qt Company’s standard support terms available at
+"Support" shall mean standard developer support that is provided by The Qt
+Company to assist Designated Users in using the Licensed Software in
+accordance with The Qt Company's standard support terms available at
 https://www.qt.io/terms-conditions/ and as further defined in Section 8
 hereunder.
 
-“Taxes” shall have the meaning set forth in Section 10.5.
-
-“Term” shall have the meaning set forth in Section 12.
-
-“The Qt Company” shall mean:
-   (i)   in the event Licensee is an individual residing in the United States
-         or a legal entity incorporated in the United States or having its
-         headquarters in the United States, The Qt Company Inc., a
-         Delaware corporation with its office at 2350 Mission College Blvd.,
-         Suite 1020, Santa Clara, CA 95054, USA.; or
-   (ii)  in the event the Licensee is an individual residing outside of the
-         United States or a legal entity incorporated outside of the United
-         States or having its registered office outside of the United States,
-         The Qt Company Ltd., a Finnish company with its registered office at
-         Bertel Jungin aukio D3A, 02600 Espoo, Finland.
-
-"Third Party Software " shall have the meaning set forth in Section 4.
-
-“Updates” shall mean a release or version of the Licensed Software containing
-bug fixes, error corrections and other changes that are generally made available
-to users of the Licensed Software that have contracted for Support. Updates are
-generally depicted as a change to the digits following the decimal in the
-Licensed Software version number. The Qt Company shall make Updates available to
-the Licensee under the Support. Updates shall be considered as part of the
-Licensed Software hereunder.
-
-“Upgrades” shall mean a release or version of the Licensed Software containing
+"Taxes" shall have the meaning set forth in Section 10.5.
+
+"Term" shall have the meaning set forth in Section 12.
+
+"The Qt Company" shall mean:
+    (i)     in the event Licensee is an individual residing in the United
+            States or a legal entity incorporated in the United States or
+            having its headquarters in the United States, The Qt Company Inc.,
+            a Delaware corporation with its office at 2350 Mission College
+            Blvd., Suite 1020, Santa Clara, CA 95054, USA.; or
+    (ii)    in the event the Licensee is an individual residing outside of the
+            United States or a legal entity incorporated outside of the United
+            States or having its registered office outside of the United
+            States, The Qt Company Ltd., a Finnish company with its registered
+            office at Bertel Jungin aukio D3A, 02600 Espoo, Finland.
+
+"Third-Party Software" shall have the meaning set forth in Section 4.
+
+"Updates" shall mean a release or version of the Licensed Software containing
+bug fixes, error corrections and other changes that are generally made
+available to users of the Licensed Software that have contracted for Support.
+Updates are generally depicted as a change to the digits following the decimal
+in the Licensed Software version number. The Qt Company shall make Updates
+available to the Licensee under the Support. Updates shall be considered as
+part of the Licensed Software hereunder.
+
+"Upgrades" shall mean a release or version of the Licensed Software containing
 enhancements and new features and are generally depicted as a change to the
 first digit of the Licensed Software version number. In the event Upgrades are
-provided to the Licensee under this Agreement, they shall be considered as part
-of the Licensed Software hereunder.
+provided to the Licensee under this Agreement, they shall be considered as
+part of the Licensed Software hereunder.
 
 
 2. OWNERSHIP
+2.1. Ownership of The Qt Company
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold.
 
-2.1 Ownership of The Qt Company
-The Licensed Software is protected by copyright laws and international copyright
-treaties, as well as other intellectual property laws and treaties. The Licensed
-Software is licensed, not sold.  All of The Qt Company's Intellectual Property
-Rights are and shall remain the exclusive property of The Qt Company or its
-licensors respectively.
+All of The Qt Company's Intellectual Property Rights are and shall remain the
+exclusive property of The Qt Company or its licensors respectively.
 
-2.2 Ownership of Licensee
+2.2. Ownership of Licensee
 All the Licensee's Intellectual Property Rights are and shall remain the
-exclusive property of the Licensee or its licensors respectively.  All
-Intellectual Property Rights to the Modified Software, Applications and Devices
-shall remain with the Licensee and no rights thereto shall be granted by the
-Licensee to The Qt Company under this Agreement (except as set forth in Section
-2.3 below).
+exclusive property of the Licensee or its licensors respectively.
+
+All Intellectual Property Rights to the Modified Software, Applications and
+Devices shall remain with the Licensee and no rights thereto shall be granted
+by the Licensee to The Qt Company under this Agreement (except as set forth in
+Section 2.3 below).
 
-2.3 Modified Software
+2.3. Modified Software
 Licensee may create bug-fixes, error corrections, patches or modifications to
-the Licensed Software (“Modified Software”). Such Modified Software may break
-the source or binary compatibility with the Licensed Software (including without
-limitation through changing the application programming interfaces ("API") or by
-adding, changing or deleting any variable, method, or class signature in the
-Licensed Software and/or any inter-process protocols, services or standards in
-the Licensed Software libraries). To the extent that Licensee’s Modified
-Software so breaks source or binary compatibility with the Licensed Software,
-Licensee acknowledges that The Qt Company's ability to provide Support may be
-prevented or limited and Licensee's ability to make use of Updates may be
-restricted.
+the Licensed Software ("Modified Software"). Such Modified Software may break
+the source or binary compatibility with the Licensed Software (including
+without limitation through changing the application programming interfaces
+("API") or by adding, changing or deleting any variable, method, or class
+signature in the Licensed Software and/or any inter-process protocols,
+services or standards in the Licensed Software libraries). To the extent that
+Licensee's Modified Software so breaks source or binary compatibility with the
+Licensed Software, Licensee acknowledges that The Qt Company's ability to
+provide Support may be prevented or limited and Licensee's ability to make use
+of Updates may be restricted.
 
 Licensee may, at its sole and absolute discretion, choose to submit Modified
-Software to The Qt Company (“Submitted Modified Software”) in connection with
-Licensee’s Support request, service request or otherwise. In the event Licensee
-does so, then, Licensee hereby grants The Qt Company a sublicensable,
+Software to The Qt Company ("Submitted Modified Software") in connection with
+Licensee's Support request, service request or otherwise. In the event
+Licensee does so, then, Licensee hereby grants The Qt Company a sublicensable,
 assignable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free and
-fully paid-up license, under all of Licensee’s Intellectual Property Rights, to
-reproduce, adapt, translate, modify, and prepare derivative works of, publicly
-display, publicly perform, sublicense, make available and distribute such
-Submitted Modified Software as The Qt Company sees fit at its free and absolute
-discretion.
-
+fully paid-up license, under all of Licensee's Intellectual Property Rights,
+to reproduce, adapt, translate, modify, and prepare derivative works of,
+publicly display, publicly perform, sublicense, make available and distribute
+such Submitted Modified Software as The Qt Company sees fit at its free and
+absolute discretion.
 
 3. LICENSES GRANTED
-
-3.1 Development with Licensed Software
+3.1. Development with Licensed Software
 Subject to the terms of this Agreement, The Qt Company grants to Licensee a
-worldwide, non- exclusive, non-transferable license, valid for the License Term,
-to use, modify and copy the Licensed Software by Designated Users on the
+worldwide, non-exclusive, non-transferable license, valid for the License
+Term, to use, modify and copy the Licensed Software by Designated Users on the
 Development Platforms for the sole purposes of designing, developing,
-demonstrating and testing Application(s) and/or Devices, and to provide thereto
-related support and other related services to end-user Customers.
+demonstrating and testing Application(s) and/or Devices, and to provide
+thereto related support and other related services to end-user Customers.
 
 Licensee may install copies of the Licensed Software on five (5) computers per
 Designated User, provided that only the Designated Users who have a valid
@@ -304,212 +298,216 @@ then-current Designated User by notifying The Qt Company in writing, provided
 that any Designated User may be replaced only once during any six-month period.
 
 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 ninety (90) 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.
+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 ninety (90) 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.
 
 Any such Renewal Term shall be subject to License Fees agreed between the
-Parties or, if no advance agreement exists, subject to The Qt Company’s standard
-pricing applicable at the commencement date of any such Renewal Term.
+Parties or, if no advance agreement exists, subject to The Qt Company's
+standard pricing applicable at the commencement date of any such Renewal Term.
 
-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.
+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.
 
 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
-the respective quote from The Qt Company and/or the respective License Fee paid
-by due date specified in The Qt Company’s respective invoice, The Qt Company
-shall apply a reinstatement fee equal to ten percent (10 %) of the total value
-of the License Fees of the Development Licenses for the expired term to be added
-to the License Fee of the respective Renewal Term.
+the respective quote from The Qt Company and/or the respective License Fee
+paid by due date specified in The Qt Company's respective invoice, The Qt
+Company shall apply a reinstatement fee equal to ten percent (10 %) of the
+total value of the License Fees of the Development Licenses for the expired
+term to be added to the License Fee of the respective Renewal Term.
 
 In the event Licensee chooses not to renew a Development License for a Renewal
 Term by notifying The Qt Company thereof no less than ninety (90) days before
-expiry of the respective License Term, Licensee may still reinstate such expired
-Development Licenses for a Renewal Term subject to applicable renewal Term
-License Fees until thirty (30) days from the expiry of the initially agreed
-License Term or preceding Renewal Term. After such thirty (30) day period a
-Development License shall be subject to applicable License Fees for a new
-Development License and not any Renewal Term License Fees.
-
-3.2 Distribution of Applications
+expiry of the respective License Term, Licensee may still reinstate such
+expired Development Licenses for a Renewal Term subject to applicable renewal
+Term License Fees until thirty (30) days from the expiry of the initially
+agreed License Term or preceding Renewal Term. After such thirty (30) day
+period a Development License shall be subject to applicable License Fees for a
+new Development License and not any Renewal Term License Fees.
+
+3.2. Distribution of Applications
 Subject to the terms of this Agreement, The Qt Company grants to Licensee a
-worldwide, non- exclusive, non-transferable, revocable (for cause pursuant to
+worldwide, non-exclusive, non-transferable, revocable (for cause pursuant to
 this Agreement) right and license, valid for the Term, to
-   (i)   distribute, by itself or through its Contractors, Redistributables as
-         installed, incorporated or integrated into Applications for execution
-         on the Deployment Platforms, and
-   (ii)  grant sublicenses to Redistributables, as distributed hereunder, for
-         Customers solely for Customer’s internal use and to the extent
-         necessary in order for the Customers to use the Applications for their
-         respective intended purposes.
+    (i)     distribute, by itself or through its Contractors, Redistributables
+            as installed, incorporated or integrated into Applications for
+            execution on the Deployment Platforms, and
+    (ii)    grant sublicenses to Redistributables, as distributed hereunder,
+            for Customers solely for Customer's internal use and to the extent
+            necessary in order for the Customers to use the Applications for
+            their respective intended purposes.
 
 Right to distribute the Redistributables as part of an Application as provided
-herein is not royalty- bearing but is conditional upon the Licensee not having
+herein is not royalty-bearing but is conditional upon the Licensee not having
 any unpaid License Fees for Development Licenses owed to The Qt Company at the
 time of distribution of any Redistributables to Customers.
 
-3.3 Distribution of Devices
+3.3. Distribution of Devices
 Subject to the terms of this Agreement, The Qt Company grants to Licensee a
-worldwide, non- exclusive, non-transferable, revocable (for cause pursuant to
+worldwide, non-exclusive, non-transferable, revocable (for cause pursuant to
 this Agreement) right and license, valid for the Term, to
-   (i)   distribute, by itself or through one or more tiers of Contractors,
-         Redistributables as installed, incorporated or integrated, or intended
-         to be installed, incorporated or integrated into Devices for execution
-         on the Deployment Platforms, and
-   (ii)  grant sublicenses to Redistributables, as distributed hereunder, for
-         Customers solely for Customer’s internal use and to the extent
-         necessary in order for the Customers to use the Devices for their
-         respective intended purposes.
+    (i)     distribute, by itself or through one or more tiers of Contractors,
+            Redistributables as installed, incorporated or integrated, or
+            intended to be installed, incorporated or integrated into Devices
+            for execution on the Deployment Platforms, and
+    (ii)    grant sublicenses to Redistributables, as distributed hereunder,
+            for Customers solely for Customer's internal use and to the extent
+            necessary in order for the Customers to use the Devices for their
+            respective intended purposes.
 
 Right to distribute the Redistributables with Devices as provided herein is
 conditional upon the Licensee (i) not having any unpaid License Fees for
-Development Licenses owed to The Qt Company, and (ii) having purchased and paid
-corresponding Distribution Licenses at the time of distribution of any
+Development Licenses owed to The Qt Company, and (ii) having purchased and
+paid corresponding Distribution Licenses at the time of distribution of any
 Redistributables to Customers.
 
-3.4 Further Requirements
+3.4. Further Requirements
 The licenses granted above in this Section 3 by The Qt Company to Licensee are
 conditional and subject to Licensee's compliance with the following terms:
-   (i)    Licensee shall not remove or alter any copyright, trademark or other
-          proprietary rights notice(s) contained in any portion of the Licensed
-          Software;
-   (ii)   Applications must add primary and substantial functionality to the
-          Licensed Software so as not to compete with the Licensed Software;
-   (iii)  Applications may not pass on functionality which in any way makes it
-          possible for others to create software with the Licensed Software;
-          provided however that Licensee may use the Licensed Software's
-          scripting and QML ("Qt Quick") functionality solely in order to enable
-          scripting, themes and styles that augment the functionality and
-          appearance of the Application(s) without adding primary and
-          substantial functionality to the Application(s);
-   (iv)   Licensee shall not use Licensed Software in any manner or for any
-          purpose that infringes, misappropriates or otherwise violates any
-          Intellectual property or right of any third party, or that violates
-          any applicable law;
-   (v)    Licensee shall not use The Qt Company's or any of its suppliers'
-          names, logos, or trademarks to market Applications, except that
-          Licensee may use “Built with Qt” logo to indicate that Application(s)
-          was developed using the Licensed Software;
-   (vi)   Licensee shall not distribute, sublicense or disclose source code of
-          Licensed Software to any third party (provided however that Licensee
-          may appoint employee(s) of Contractors as Designated Users to use
-          Licensed Software pursuant to this Agreement). Such right may be
-          available for the Licensee subject to a separate software development
-          kit (“SDK”) license agreement to be concluded with The Qt Company;
-   (vii)  Licensee shall not grant the Customers a right to (i) make copies of
-          the Redistributables except when and to the extent required to use the
-          Applications and/or Devices for their intended purpose, (ii) modify
-          the Redistributables or create derivative works thereof, (iii)
-          decompile, disassemble or otherwise reverse engineer Redistributables,
-          or (iv) redistribute any copy or portion of the Redistributables to
-          any third party, except as part of the onward sale of the Device on
-          which the Redistributables are installed;
-   (viii) Licensee shall not and shall cause that its Affiliates or Contractors
-          shall not use Licensed Software in any Prohibited Combination, unless
-          Licensee has received an advance written permission from The Qt
-          Company to do so. Absent such written permission, any and all
-          distribution by the Licensee during the Term of a hardware device or
-          product a) which incorporate or integrate any part of Licensed
-          Software or Open Source Qt; or b) where the main user interface or
-          substantial functionality is provided by software built with
-          Licensed Software or Open Source Qt or otherwise depends on the
-          Licensed Software or Open Source Qt, shall be considered to be
-          Device distribution under this Agreement and shall be dependent on
-          Licensee’s compliance thereof (including but not limited to
-          obligation to pay applicable License Fees for such distribution).
-          Notwithstanding what is provided above in this sub-section (viii),
-          Licensee is entitled to use and combine Qt 3D Studio and/or Qt
-          Design Studio with Open Source Qt (“Permitted Combination”) for
-          its internal evaluation purposes, provided that Licensee shall in no
-          way transfer, publish, disclose, display or otherwise make available
-          any software or work resulting from such Permitted Combination;
-   (ix)   Licensee shall cause all of its Affiliates and Contractors entitled
-          to make use of the licenses granted under this Agreement, to be
-          contractually bound to comply with the relevant terms of this
-          Agreement and not to use the Licensed Software beyond the terms
-          hereof and for any purposes other than operating within the scope of
-          their services for Licensee. Licensee shall be responsible for any
-          and all actions and omissions of its Affiliates and Contractors
-          relating to the Licensed Software and use thereof (including but not
-          limited to payment of all applicable License Fees);
-   (x)    Except when and to the extent explicitly provided in this Section 3,
-          Licensee shall not transfer, publish, disclose, display or otherwise
-          make available the Licensed Software; and
-   (xi)   Licensee shall not attempt or enlist a third party to conduct or
-          attempt to conduct any of the above.
-
-Above terms shall not be applicable if and to the extent they conflict with any
-mandatory provisions of any applicable laws. Any use of Licensed Software
-beyond the provisions of this Agreement is strictly prohibited and requires an
-additional license from The Qt Company.
-
-
-4. THIRD PARTY SOFTWARE
+    (i)     Licensee shall not remove or alter any copyright, trademark or
+            other proprietary rights notice(s) contained in any portion of the
+            Licensed Software;
+    (ii)    Applications must add primary and substantial functionality to the
+            Licensed Software so as not to compete with the Licensed Software;
+    (iii)   Applications may not pass on functionality which in any way makes
+            it possible for others to create software with the Licensed
+            Software; provided however that Licensee may use the Licensed
+            Software's scripting and QML ("Qt Quick") functionality solely in
+            order to enable scripting, themes and styles that augment the
+            functionality and appearance of the Application(s) without adding
+            primary and substantial functionality to the Application(s);
+    (iv)    Licensee shall not use Licensed Software in any manner or for any
+            purpose that infringes, misappropriates or otherwise violates any
+            Intellectual property or right of any third party, or that
+            violates any applicable law;
+    (v)     Licensee shall not use The Qt Company's or any of its suppliers'
+            names, logos, or trademarks to market Applications, except that
+            Licensee may use "Built with Qt" logo to indicate that
+            Application(s) was developed using the Licensed Software;
+    (vi)    Licensee shall not distribute, sublicense or disclose source code
+            of Licensed Software to any third party (provided however that
+            Licensee may appoint employee(s) of Contractors as Designated
+            Users to use Licensed Software pursuant to this Agreement). Such
+            right may be available for the Licensee subject to a separate
+            software development kit ("SDK") license agreement to be concluded
+            with The Qt Company;
+    (vii)   Licensee shall not grant the Customers a right to (i) make copies
+            of the Redistributables except when and to the extent required to
+            use the Applications and/or Devices for their intended purpose,
+            (ii) modify the Redistributables or create derivative works
+            thereof, (iii) decompile, disassemble or otherwise reverse
+            engineer Redistributables, or (iv) redistribute any copy or
+            portion of the Redistributables to any third party, except as part
+            of the onward sale of the Device on which the Redistributables are
+            installed;
+    (viii)  Licensee shall not and shall cause that its Affiliates or
+            Contractors shall not use Licensed Software in any Prohibited
+            Combination, unless Licensee has received an advance written
+            permission from The Qt Company to do so. Absent such written
+            permission, any and all distribution by the Licensee during the
+            Term of a hardware device or product a) which incorporate or
+            integrate any part of Licensed Software or Open Source Qt; or b)
+            where the main user interface or substantial functionality is
+            provided by software built with Licensed Software or Open Source
+            Qt or otherwise depends on the Licensed Software or Open Source
+            Qt, shall be considered to be Device distribution under this
+            Agreement and shall be dependent on Licensee's compliance thereof
+            (including but not limited to obligation to pay applicable License
+            Fees for such distribution). Notwithstanding what is provided
+            above in this sub-section (viii), Licensee is entitled to use and
+            combine Qt 3D Studio and/or Qt Design Studio with Open Source Qt
+            ("Permitted Combination") for its internal evaluation purposes,
+            provided that Licensee shall in no way transfer, publish, disclose,
+            display or otherwise make available any software or work resulting
+            from such Permitted Combination;
+    (ix)    Licensee shall cause all of its Affiliates and Contractors
+            entitled to make use of the licenses granted under this Agreement,
+            to be contractually bound to comply with the relevant terms of
+            this Agreement and not to use the Licensed Software beyond the
+            terms hereof and for any purposes other than operating within the
+            scope of their services for Licensee. Licensee shall be responsible
+            for any and all actions and omissions of its Affiliates and
+            Contractors relating to the Licensed Software and use thereof
+            (including but not limited to payment of all applicable License
+            Fees);
+    (x)     Except when and to the extent explicitly provided in this Section
+            3, Licensee shall not transfer, publish, disclose, display or
+            otherwise make available the Licensed Software; and
+    (xi)    Licensee shall not attempt or enlist a third party to conduct or
+            attempt to conduct any of the above.
+
+Above terms shall not be applicable if and to the extent they conflict with
+any mandatory provisions of any applicable laws.
+Any use of Licensed Software beyond the provisions of this Agreement is
+strictly prohibited and requires an additional license from The Qt Company.
+
+4. THIRD-PARTY SOFTWARE
 The Licensed Software may provide links to third party libraries or code
-(collectively "Third Party Software") to implement various functions. Third
-Party Software does not comprise part of the Licensed Software. In some cases,
-access to Third Party Software may be included with the Licensed Software. Such
-Third Party Software will be listed in the ".../src/3rdparty" source tree
-delivered with the Licensed Software or documented in the Licensed Software, as
-such may be amended from time to time. Licensee acknowledges that use or
-distribution of Third Party Software is in all respects subject to applicable
-license terms of applicable third party right holders.
-
+(collectively "Third-Party Software") to implement various functions.
+Third-Party Software does not comprise part of the Licensed Software. In some
+cases, access to Third-Party Software may be included with the Licensed
+Software. Such Third-Party Software will be listed in the ".../src/3rdparty"
+source tree delivered with the Licensed Software or documented in the Licensed
+Software, as such may be amended from time to time. Licensee acknowledges that
+use or distribution of Third-Party Software is in all respects subject to
+applicable license terms of applicable third-party right holders.
 
 5. PRE-RELEASE CODE
 The Licensed Software may contain pre-release code and functionality, or sample
-code marked or otherwise stated with appropriate designation such as “Technology
-Preview”, “Alpha”, “Beta”, “Sample” etc. (“Pre-Release Code”).
+code marked or otherwise stated with appropriate designation such as
+"Technology Preview", "Alpha", "Beta", "Sample" etc. ("Pre-Release Code").
 
-Such Pre-Release Code may be present complimentary for the Licensee, in order to
-provide experimental support or information for new platforms or preliminary
+Such Pre-Release Code may be present complimentary for the Licensee, in order
+to provide experimental support or information for new platforms or preliminary
 versions of one or more new functionalities or for other similar reasons. The
 Pre-Release Code may not be at the level of performance and compatibility of a
-final, generally available, product offering.  The Pre-Release Code may not
+final, generally available, product offering. The Pre-Release Code may not
 operate correctly, may contain errors and may be substantially modified by The
-Qt Company prior to the first commercial product release, if any. The Qt Company
-is under no obligation to make Pre-Release Code commercially available, or
-provide any Support or Updates relating thereto. The Qt Company assumes no
+Qt Company prior to the first commercial product release, if any. The Qt
+Company is under no obligation to make Pre-Release Code commercially available,
+or provide any Support or Updates relating thereto. The Qt Company assumes no
 liability whatsoever regarding any Pre-Release Code, but any use thereof is
-exclusively at Licensee’s own risk and expense.
+exclusively at Licensee's own risk and expense.
 
 For clarity, unless Licensed Software specifies different license terms for the
-respective Pre- Release Code, the Licensee is entitled to use such pre-release
+respective Pre-Release Code, the Licensee is entitled to use such pre-release
 code pursuant to Section 3, just like other Licensed Software, provided however
-that in the event Add-on Products are included and available as such Pre-Release
-Code, Licensee’s right to use such Add-on Products is nevertheless subject to
-and conditional upon conclusion of separate agreement with The Qt Company.
-
+that in the event Add-on Products are included and available as such
+Pre-Release Code, Licensee's right to use such Add-on Products is nevertheless
+subject to and conditional upon conclusion of separate agreement with The Qt
+Company.
 
 6. LIMITED WARRANTY AND WARRANTY DISCLAIMER
 The Qt Company hereby represents and warrants that it has the power and
 authority to grant the rights and licenses granted to Licensee under this
-Agreement.  Except as set forth above, the Licensed Software is licensed to
-Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire
-liability for errors in the Licensed Software shall be limited, at The Qt
-Company’s option, to correction of the error, replacement of the Licensed
-Software or return of the applicable fees paid for the defective Licensed
-Software for the time period during which the License is not able to utilize the
-Licensed Software under the terms of this Agreement.
+Agreement.
+
+Except as set forth above, the Licensed Software is licensed to Licensee
+"as is" and Licensee's exclusive remedy and The Qt Company's entire liability
+for errors in the Licensed Software shall be limited, at The Qt Company's
+option, to correction of the error, replacement of the Licensed Software or
+return of the applicable fees paid for the defective Licensed Software for the
+time period during which the License is not able to utilize the Licensed
+Software under the terms of this Agreement.
 
 TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF
 ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER
 WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
 WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
 NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT
-WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT
+WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR THAT
 IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE
 UNINTERRUPTED.
 
-
 7. INDEMNIFICATION AND LIMITATION OF LIABILITY
-
-7.1 Limitation of Liability
+7.1. Limitation of Liability
 EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT,  AND (II)
 BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO
 EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT,
@@ -519,16 +517,19 @@ HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT.
 
 EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT,  AND (II)
 BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO
-EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT EXCEED
-THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT COMPANY FROM LICENSEE
-DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE EVENT
-RESULTING IN SUCH LIABILITY.  THE PROVISIONS OF THIS SECTION 7 ALLOCATE THE
-RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE AND THE PARTIES
-HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING WHETHER TO
-ENTER INTO THIS AGREEMENT.  NOTWITHSTANDING ANYTHING TO THE CONTRARY IN THIS
-AGREEMENT, LICENSEE SHALL ALWAYS BE LIABLE TO PAY THE APPLICABLE LICENSE FEES
-CORRESPONDING TO ITS ACTUAL USE OF LICENSED SOFTWARE.
+EVENT SHALL EITHER PARTY'S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT
+EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT COMPANY FROM
+LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE
+EVENT RESULTING IN SUCH LIABILITY.
 
+THE PROVISIONS OF THIS SECTION 7 ALLOCATE THE RISKS UNDER THIS AGREEMENT
+BETWEEN THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE
+LIMITATIONS SET FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS
+AGREEMENT.
+
+NOTWITHSTANDING ANYTHING TO THE CONTRARY IN THIS AGREEMENT, LICENSEE SHALL
+ALWAYS BE LIABLE TO PAY THE APPLICABLE LICENSE FEES CORRESPONDING TO ITS ACTUAL
+USE OF LICENSED SOFTWARE.
 
 8. SUPPORT, UPDATES AND ONLINE SERVICES
 Upon due payment of the agreed License Fees the Licensee will be eligible to
@@ -539,747 +540,792 @@ unless the Parties specifically otherwise agree.
 
 Unless otherwise decided by The Company at its free and absolute discretion,
 Upgrades will not be included in the Support but may be available subject to
-additional fees.  From time to time The Qt Company may change the Support terms,
-provided that during the respective ongoing License Term the level of Support
-provided by The Qt Company may not be reduced without the consent of the
-Licensee.  Unless otherwise agreed, The Qt Company shall not be responsible for
-providing any service or support to Customers.
+additional fees.
+
+From time to time The Qt Company may change the Support terms, provided that
+during the respective ongoing License Term the level of Support provided by The
+Qt Company may not be reduced without the consent of the Licensee.
 
+Unless otherwise agreed, The Qt Company shall not be responsible for providing
+any service or support to Customers.
 
 9. CONFIDENTIALITY
 Each Party acknowledges that during the Term of this Agreement each Party may
-receive information about the other Party's business, business methods, business
-plans, customers, business relations, technology, and other information,
-including the terms of this Agreement, that is confidential and of great value
-to the other Party, and the value of which would be significantly reduced if
-disclosed to third parties (“Confidential Information”). Accordingly, when a
-Party (the “Receiving Party”) receives Confidential Information from the other
-Party (the “Disclosing Party”), the Receiving Party shall only disclose such
-information to employees and Contractors on a need to know basis, and shall
-cause its employees and employees of its Affiliates to: (i) maintain any and all
-Confidential Information in confidence; (ii) not disclose the Confidential
-Information to a third party without the Disclosing Party's prior written
-approval; and (iii) not, directly or indirectly, use the Confidential
-Information for any purpose other than for exercising its rights and fulfilling
-its responsibilities pursuant to this Agreement. Each Party shall take
-reasonable measures to protect the Confidential Information of the other Party,
-which measures shall not be less than the measures taken by such Party to
-protect its own confidential and proprietary information.  Obligation of
-confidentiality shall not apply to information that (i) is or becomes generally
-known to the public through no act or omission of the Receiving Party; (ii) was
-in the Receiving Party's lawful possession prior to the disclosure hereunder and
-was not subject to limitations on disclosure or use; (iii) is developed
-independently by employees or Contractors of the Receiving Party or other
-persons working for the Receiving Party who have not had access to the
-Confidential Information of the Disclosing Party, as proven by the written
-records of the Receiving Party; (iv) is lawfully disclosed to the Receiving
-Party without restrictions, by a third party not under an obligation of
-confidentiality; or (v) the Receiving Party is legally compelled to disclose, in
-which case the Receiving Party shall notify the Disclosing Party of such
-compelled disclosure and assert the privileged and confidential nature of the
-information and cooperate fully with the Disclosing Party to limit the scope of
-disclosure and the dissemination of disclosed Confidential Information to the
-minimum extent necessary.
+receive information about the other Party's business, business methods,
+business plans, customers, business relations, technology, and other
+information, including the terms of this Agreement, that is confidential and of
+great value to the other Party, and the value of which would be significantly
+reduced if disclosed to third parties ("Confidential Information").
+Accordingly, when a Party (the "Receiving Party") receives Confidential
+Information from the other Party (the "Disclosing Party"), the Receiving Party
+shall only disclose such information to employees and Contractors on a need to
+know basis, and shall cause its employees and employees of its Affiliates to:
+(i) maintain any and all Confidential Information in confidence; (ii) not
+disclose the Confidential Information to a third party without the Disclosing
+Party's prior written approval; and (iii) not, directly or indirectly, use the
+Confidential Information for any purpose other than for exercising its rights
+and fulfilling its responsibilities pursuant to this Agreement. Each Party
+shall take reasonable measures to protect the Confidential Information of the
+other Party, which measures shall not be less than the measures taken by such
+Party to protect its own confidential and proprietary information.
+
+Obligation of confidentiality shall not apply to information that (i) is or
+becomes generally known to the public through no act or omission of the
+Receiving Party; (ii) was in the Receiving Party's lawful possession prior to
+the disclosure hereunder and was not subject to limitations on disclosure or
+use; (iii) is developed independently by employees or Contractors of the
+Receiving Party or other persons working for the Receiving Party who have not
+had access to the Confidential Information of the Disclosing Party, as proven
+by the written records of the Receiving Party; (iv) is lawfully disclosed to
+the Receiving Party without restrictions, by a third party not under an
+obligation of confidentiality; or (v) the Receiving Party is legally compelled
+to disclose, in which case the Receiving Party shall notify the Disclosing
+Party of such compelled disclosure and assert the privileged and confidential
+nature of the information and cooperate fully with the Disclosing Party to
+limit the scope of disclosure and the dissemination of disclosed Confidential
+Information to the minimum extent necessary.
 
 The obligations under this Section 9 shall continue to remain in force for a
 period of five (5) years after the last disclosure, and, with respect to trade
 secrets, for so long as such trade secrets are protected under applicable trade
 secret laws.
 
-
 10. FEES, DELIVERY AND PAYMENT
+10.1. License Fees
+License Fees are described in The Qt Company's standard price list, quote or
+Purchase Order confirmation or in an appendix hereto, as the case may be.
 
-10.1 License Fees
-License Fees are described in The Qt Company’s standard price list, quote or
-Purchase Order confirmation or in an appendix hereto, as the case may be.  The
-License Fees shall not be refunded or claimed as a credit in any event or for
-any reason whatsoever.
+The License Fees shall not be refunded or claimed as a credit in any event or
+for any reason whatsoever.
 
-10.2 Ordering Licenses
-Licensee may purchase Development Licenses and Distribution Licenses pursuant to
-agreed pricing terms or, if no specific pricing terms have been agreed upon, at
-The Qt Company's standard pricing terms applicable at the time of purchase.
+10.2. Ordering Licenses
+Licensee may purchase Development Licenses and Distribution Licenses pursuant
+to agreed pricing terms or, if no specific pricing terms have been agreed upon,
+at The Qt Company's standard pricing terms applicable at the time of purchase.
 Unless specifically otherwise provided, any pricing terms referenced in this
 Agreement shall be valid for twelve (12) months from the date of this Agreement.
+
 Licensee shall submit all purchase orders for Development Licenses and
 Distribution Licenses to The Qt Company by email or any other method acceptable
-to The Qt Company (each such order is referred to herein as a “Purchase Order”)
+to The Qt Company (each such order is referred to herein as a "Purchase Order")
 for confirmation, whereupon the Purchase Order shall become binding between the
 Parties.
 
-10.3 Distribution License Packs
+10.3. Distribution License Packs
 Unless otherwise agreed, Distribution Licenses shall be purchased by way of
-Distribution License Packs.  Upon due payment of the ordered Distribution
-License Pack(s), the Licensee will have an account of Distribution Licenses
-available for distributing the Redistributables in accordance with this
-Agreement.  Each time Licensee distributes a copy of Redistributables, then one
-Distribution License is used, and Licensee’s account of available Distribution
-Licenses is decreased accordingly.  Licensee may distribute copies of the
-Redistributables so long as Licensee has Distribution Licenses remaining on its
-account.
-
-10.4 Payment Terms
+Distribution License Packs.
+
+Upon due payment of the ordered Distribution License Pack(s), the Licensee will
+have an account of Distribution Licenses available for distributing the
+Redistributables in accordance with this Agreement.
+
+Each time Licensee distributes a copy of Redistributables, then one
+Distribution License is used, and Licensee's account of available Distribution
+Licenses is decreased accordingly.Licensee may distribute copies of the
+Redistributables so long as Licensee has Distribution Licenses remaining on
+its account.
+
+10.4. Payment Terms
 License Fees and any other charges under this Agreement shall be paid by
-Licensee no later than thirty (30) days from the date of the applicable invoice
-from The Qt Company.  The Qt Company will submit an invoice to Licensee after
-the date of this Agreement and/or after The Qt Company receives a Purchase Order
-from Licensee.  A late payment charge of the lower of (a) one percent per month;
-or (b) the interest rate stipulated by applicable law, shall be charged on any
-unpaid balances that remain past due.
-
-10.5 Taxes
-All License Fees and other charges payable hereunder are gross amounts but
-exclusive of any value added tax, use tax, sales tax, withholding tax and other
-taxes, duties or tariffs (“Taxes”) levied directly for the sale, delivery or use
-of Licensed Software hereunder pursuant to any applicable law. Such applicable
-Taxes shall be paid by Licensee to The Qt Company, or, where applicable, in lieu
-of payment of such Taxes to The Qt Company, Licensee shall provide an exemption
-certificate to The Qt Company and any applicable authority.
+Licensee no later than thirty (30) days from the date of the applicable
+invoice from The Qt Company.
+
+The Qt Company will submit an invoice to Licensee after the date of this
+Agreement and/or after The Qt Company receives a Purchase Order from Licensee.
 
-11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS
+A late payment charge of the lower of (a) one percent per month; or (b) the
+interest rate stipulated by applicable law, shall be charged on any unpaid
+balances that remain past due.
 
-11.1 Licensee’s Record-keeping
+10.5. Taxes
+All License Fees and other charges payable hereunder are gross amounts but
+exclusive of any value added tax, use tax, sales tax, withholding tax and other
+taxes, duties or tariffs ("Taxes") levied directly for the sale, delivery or
+use of Licensed Software hereunder pursuant to any applicable law. Such
+applicable Taxes shall be paid by Licensee to The Qt Company, or, where
+applicable, in lieu of payment of such Taxes to The Qt Company, Licensee shall
+provide an exemption certificate to The Qt Company and any applicable authority.
+
+11. RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS
+11.1. Licensee's Record-keeping
 Licensee shall at all times during the Term of this Agreement and for a period
-of seven (7) years thereafter maintain Licensee’s Records in an accurate and
-up-to-date form.  Licensee’s Records shall be adequate to reasonably enable The
-Qt Company to determine Licensee’s compliance with the provisions of this
+of seven (7) years thereafter maintain Licensee's Records in an accurate and
+up-to-date form. Licensee's Records shall be adequate to reasonably enable The
+Qt Company to determine Licensee's compliance with the provisions of this
 Agreement. The records shall conform to general good accounting practices.
-Licensee shall, within thirty (30) days from receiving The Qt Company’s request
-to that effect, deliver to The Qt Company a report based on Licensee’s Records,
+
+Licensee shall, within thirty (30) days from receiving The Qt Company's request
+to that effect, deliver to The Qt Company a report based on Licensee's Records,
 such report to contain information, in sufficient detail, on (i) number and
 identity of users working with Licensed Software or Open Source Qt, (ii) copies
 of Redistributables distributed by Licensee during the most recent calendar
 quarter and/or any other term specified by The Qt Company, (iii) number of
 undistributed copies of Redistributables and corresponding number of unused
-Distribution Licenses remaining on Licensee’s account, and (iv) any other
+Distribution Licenses remaining on Licensee's account, and (iv) any other
 information as The Qt Company may reasonably require from time to time.
 
-11.2. The Qt Company’s Audit Rights
-The Qt Company or an independent auditor acting on behalf of The Qt Company’s,
-may, upon at least five (5) business days’ prior written notice and at its
-expense, audit Licensee with respect to the Licensee’s use of the Licensed
-Software, but not more frequently than once during each 6- month period. Such
+11.2. The Qt Company's Audit Rights
+The Qt Company or an independent auditor acting on behalf of The Qt Company's,
+may, upon at least five (5) business days' prior written notice and at its
+expense, audit Licensee with respect to the Licensee's use of the Licensed
+Software, but not more frequently than once during each 6-month period. Such
 audit may be conducted by mail, electronic means or through an in-person visit
-to Licensee’s place of business. Any such in-person audit shall be conducted
+to Licensee's place of business. Any such in-person audit shall be conducted
 during regular business hours at Licensee's facilities and shall not
 unreasonably interfere with Licensee's business activities. The Qt Company or
 the independent auditor acting on behalf of The Qt Company shall be entitled to
-inspect Licensee’s Records and conduct necessary interviews of Licensee’s
-relevant employees and Contractors. All such Licensee’s Records and use thereof
-shall be subject to an obligation of confidentiality under this Agreement.  If
-an audit reveals that Licensee is using the Licensed Software beyond scope of
-the licenses Licensee has paid for, Licensee agrees to pay The Qt Company any
-amounts owed for such unauthorized use within 30 days from receipt of the
-corresponding invoice from The Qt Company.  In addition, in the event the audit
-reveals a material violation of the terms of this Agreement (without limitation,
-either (i) underpayment of more than 10 % of License Fees or 10,000 euros
-(whichever is more) or (ii) distribution of products, which include or result
-from Prohibited Combination, shall be deemed a material violation for purposes
-of this section), then the Licensee shall pay The Qt Company's reasonable cost
-of conducting such audit.
-
-
-12 TERM AND TERMINATION
-
-12.1 Agreement Term
+inspect Licensee's Records and conduct necessary interviews of Licensee's
+relevant employees and Contractors. All such Licensee's Records and use thereof
+shall be subject to an obligation of confidentiality under this Agreement.
+
+If an audit reveals that Licensee is using the Licensed Software beyond scope
+of the licenses Licensee has paid for, Licensee agrees to pay The Qt Company
+any amounts owed for such unauthorized use within 30 days from receipt of the
+corresponding invoice from The Qt Company. In addition, in the event the audit
+reveals a material violation of the terms of this Agreement (without
+limitation, either (i) underpayment of more than 10 % of License Fees or 10,000
+euros (whichever is more) or (ii) distribution of products, which include or
+result from Prohibited Combination, shall be deemed a material violation for
+purposes of this section), then the Licensee shall pay The Qt Company's
+reasonable cost of conducting such audit.
+
+12. TERM AND TERMINATION
+12.1. Agreement Term
 This Agreement shall enter into force upon due acceptance by both Parties and
 remain in force for as long as there is any Development License(s) purchased
-under this Agreement in force (“Term”), unless and until terminated pursuant to
+under this Agreement in force ("Term"), unless and until terminated pursuant to
 the terms of this Section 12.
 
-12.2 Termination and suspension of rights
+12.2. Termination and suspension of rights
 Either Party shall have the right to terminate this Agreement upon thirty (30)
 days prior written notice if the other Party commits a material breach of any
 obligation of this Agreement and fails to remedy such breach within such notice
-period.  Instead of termination, The Qt Company shall have the right to suspend
-or withhold grants of all rights to the Licensed Software hereunder, including
-but not limited to the Development Licenses, Distribution License, and Support,
+period.
+
+Instead of termination, The Qt Company shall have the right to suspend or
+withhold grants of all rights to the Licensed Software hereunder, including but
+not limited to the Development Licenses, Distribution License, and Support,
 should Licensee fail to make payment in timely fashion or otherwise violates or
 is reasonably suspected to violate its obligations or terms of this Agreement,
 and where such violation or breach is not cured within five (5) business days
-following The Qt Company’s written notice thereof.
+following The Qt Company's written notice thereof.
 
-12.3 Mutual Right to Terminate
+12.3. Mutual Right to Terminate
 Either Party shall have the right to terminate this Agreement immediately upon
 written notice in the event that the other Party becomes insolvent, files for
-any form of bankruptcy, makes any assignment for the benefit of creditors, has a
-receiver, administrative receiver or officer appointed over the whole or a
-substantial part of its assets, ceases to conduct business, or an act equivalent
-to any of the above occurs under the laws of the jurisdiction of the other
-Party.
-
-12.4 Parties´ Rights and Duties upon Termination
-Upon expiry or termination of the Agreement Licensee shall cease and shall cause
-all Designated Users (including those of its Affiliates’ and Contractors’) to
-cease using the Licensed Software and distribution of the Redistributables under
-this Agreement. 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
-   (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, to continue
-         distribution of Devices under the Distribution Licenses paid but
-         unused at such effective date of termination.
-
-Upon any such termination the Licensee shall destroy or return to The Qt Company
-all copies of the Licensed Software and all related materials and will certify
-the same to The Qt Company upon its request, provided however that Licensee may
-retain and exploit such copies of the Licensed Software as it may reasonably
-require in providing continued support to Customers.  Expiry or termination of
-this Agreement for any reason whatsoever shall not relieve Licensee of its
-obligation to pay any License Fees accrued or payable to The Qt Company prior to
-the effective date of termination, and Licensee shall immediately pay to The Qt
-Company all such fees upon the effective date of termination. Termination of
-this Agreement shall not affect any rights of Customers to continue use of
-Applications and Devices (and therein incorporated Redistributables).
-
-12.5 Extension in case of bankruptcy
+any form of bankruptcy, makes any assignment for the benefit of creditors, has
+a receiver, administrative receiver or officer appointed over the whole or a
+substantial part of its assets, ceases to conduct business, or an act
+equivalent to any of the above occurs under the laws of the jurisdiction of the
+other Party.
+
+12.4. Parties´ Rights and Duties upon Termination
+Upon expiry or termination of the Agreement, Licensee shall cease and shall
+cause all Designated Users (including those of its Affiliates' and
+Contractors') to cease using the Licensed Software and distribution of the
+Redistributables under this Agreement.
+
+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
+    (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,
+            to continue distribution of Devices under the Distribution Licenses
+            paid but unused at such effective date of termination.
+
+Upon any such termination the Licensee shall destroy or return to The Qt
+Company all copies of the Licensed Software and all related materials and will
+certify the same to The Qt Company upon its request, provided however that
+Licensee may retain and exploit such copies of the Licensed Software as it may
+reasonably require in providing continued support to Customers.
+
+Expiry or termination of this Agreement for any reason whatsoever shall not
+relieve Licensee of its obligation to pay any License Fees accrued or payable
+to The Qt Company prior to the effective date of termination, and Licensee
+shall immediately pay to The Qt Company all such fees upon the effective date
+of termination. Termination of this Agreement shall not affect any rights of
+Customers to continue use of Applications and Devices (and therein incorporated
+Redistributables).
+
+12.5. Extension in case of bankruptcy
 In the event The Qt Company is declared bankrupt under a final, non-cancellable
 decision by relevant court of law, and this Agreement is not, at the date of
-expiry of the Development License(s) pursuant to Section 3.1, assigned to party,
-who has assumed The Qt Company’s position as a legitimate licensor of Licensed
-Software under this Agreement, then all valid licenses possessed by the Licensee
-at such date of expiry, and which the Licensee has not notified for expiry,
-shall be extended to be valid in perpetuity under the terms of this Agreement.
-
+expiry of the Development License(s) pursuant to Section 3.1, assigned to
+party, who has assumed The Qt Company's position as a legitimate licensor of
+Licensed Software under this Agreement, then all valid licenses possessed by
+the Licensee at such date of expiry, and which the Licensee has not notified
+for expiry, shall be extended to be valid in perpetuity under the terms of this
+Agreement.
 
 13. GOVERNING LAW AND LEGAL VENUE
 In the event this Agreement is in the name of The Qt Company Inc., a Delaware
 Corporation, then:
-   (i)   this Agreement shall be construed and interpreted in accordance with
-         the laws of the State of California, USA, excluding its choice of law
-         provisions;
-   (ii)  the United Nations Convention on Contracts for the International Sale
-         of Goods will not apply to this Agreement; and
-   (iii) any dispute, claim or controversy arising out of or relating to this
-         Agreement or the breach, termination, enforcement, interpretation or
-         validity thereof, including the determination of the scope or
-         applicability of this Agreement to arbitrate, shall be determined by
-         arbitration in San Francisco, USA, before one arbitrator. The
-         arbitration shall be administered by JAMS pursuant to JAMS'
-         Streamlined Arbitration Rules and Procedures. Judgment on the Award
-         may be entered in any court having jurisdiction.  This Section shall
-         not preclude parties from seeking provisional remedies in aid of
-         arbitration from a court of appropriate jurisdiction.
+    (i)     this Agreement shall be construed and interpreted in accordance
+            with the laws of the State of California, USA, excluding its choice
+            of law provisions;
+    (ii)    the United Nations Convention on Contracts for the International
+            Sale of Goods will not apply to this Agreement; and
+    (iii)   any dispute, claim or controversy arising out of or relating to
+            this Agreement or the breach, termination, enforcement,
+            interpretation or validity thereof, including the determination of
+            the scope or applicability of this Agreement to arbitrate, shall
+            be determined by arbitration in San Francisco, USA, before one
+            arbitrator. The arbitration shall be administered by JAMS pursuant
+            to JAMS' Streamlined Arbitration Rules and Procedures. Judgment on
+            the Award may be entered in any court having jurisdiction. This
+            Section shall not preclude parties from seeking provisional
+            remedies in aid of arbitration from a court of appropriate
+            jurisdiction.
 
 In the event this Agreement is in the name of The Qt Company Ltd., a Finnish
 Company, then:
-   (i)   this Agreement shall be construed and interpreted in accordance with
-         the laws of Finland, excluding its choice of law provisions;
-   (ii)  the United Nations Convention on Contracts for the International Sale
-         of Goods will not apply to this Agreement; and
-   (iii) any disputes, controversy or claim arising out of or relating to this
-         Agreement, or the breach, termination or validity thereof shall be
-         finally settled by arbitration in accordance with the Arbitration
-         Rules of Finland Chamber of Commerce. The arbitration tribunal shall
-         consist of one (1), or if either Party so requires, of three (3),
-         arbitrators. The award shall be final and binding and enforceable in
-         any court of competent jurisdiction. The arbitration shall be held in
-         Helsinki, Finland and the process shall be conducted in the English
-         language. This Section shall not preclude parties from seeking
-         provisional remedies in aid of arbitration from a court of
-         appropriate jurisdiction.
-
+    (i)     this Agreement shall be construed and interpreted in accordance
+            with the laws of Finland, excluding its choice of law provisions;
+    (ii)    the United Nations Convention on Contracts for the International
+            Sale of Goods will not apply to this Agreement; and
+    (iii)   any disputes, controversy or claim arising out of or relating to
+            this Agreement, or the breach, termination or validity thereof
+            shall be finally settled by arbitration in accordance with the
+            Arbitration Rules of Finland Chamber of Commerce. The arbitration
+            tribunal shall consist of one (1), or if either Party so requires,
+            of three (3), arbitrators. The award shall be final and binding and
+            enforceable in any court of competent jurisdiction. The arbitration
+            shall be held in Helsinki, Finland and the process shall be
+            conducted in the English language. This Section shall not preclude
+            parties from seeking provisional remedies in aid of arbitration
+            from a court of appropriate jurisdiction.
 
 14. GENERAL PROVISIONS
-
-14.1 No Assignment
+14.1. No Assignment
 Except in the case of a merger or sale of substantially all of its corporate
 assets, Licensee shall not be entitled to assign or transfer all or any of its
 rights, benefits and obligations under this Agreement without the prior written
 consent of The Qt Company, which shall not be unreasonably withheld or delayed.
-The Qt Company shall be entitled to freely assign or transfer any of its rights,
-benefits or obligations under this Agreement.  14.2 No Third Party
-Representations Licensee shall make no representations or warranties concerning
-the Licensed Software on behalf of The Qt Company. Any representation or
-warranty Licensee makes or purports to make on The Qt Company’s behalf shall be
-void as to The Qt Company.  14.3 Surviving Sections Any terms and conditions
-that by their nature or otherwise reasonably should survive termination of this
-Agreement shall so be deemed to survive. Such sections include especially the
-following: 1, 2, 6, 7, 9, 11, 12.4, 13 and 14.
-
-14.4 Entire Agreement
+The Qt Company shall be entitled to freely assign or transfer any of its
+rights, benefits or obligations under this Agreement.
+
+14.2. No Third-Party Representations
+Licensee shall make no representations or warranties concerning the Licensed
+Software on behalf of The Qt Company. Any representation or warranty Licensee
+makes or purports to make on The Qt Company's behalf shall be void as to The
+Qt Company.
+
+14.3. Surviving Sections
+Any terms and conditions that by their nature or otherwise reasonably should
+survive termination of this Agreement shall so be deemed to survive. Such
+sections include especially the following: 1, 2, 6, 7, 9, 11, 12.4, 13 and 14.
+
+14.4. Entire Agreement
 This Agreement, the exhibits hereto, the License Certificate and any applicable
 Purchase Order accepted by The Qt Company constitute the complete agreement
 between the Parties and supersedes all prior or contemporaneous discussions,
 representations, and proposals, written or oral, with respect to the subject
-matters discussed herein.  In the event of any conflict or inconsistency between
-this Agreement and any Purchase Order, the terms of this Agreement will prevail
-over the terms of the Purchase Order with respect to such conflict or
-inconsistency.  Parties specifically acknowledge and agree that this Agreement
-prevails over any click-to-accept or similar agreements the Designated Users may
-need to accept online upon download of the Licensed Software, as may be required
-by The Qt Company’s applicable processes relating to Licensed Software.
-
-14.5 Modifications
+matters discussed herein.
+
+In the event of any conflict or inconsistency between this Agreement and any
+Purchase Order, the terms of this Agreement will prevail over the terms of the
+Purchase Order with respect to such conflict or inconsistency.
+
+Parties specifically acknowledge and agree that this Agreement prevails over
+any click-to-accept or similar agreements the Designated Users may need to
+accept online upon download of the Licensed Software, as may be required by
+The Qt Company's applicable processes relating to Licensed Software.
+
+14.5. Modifications
 No modification of this Agreement shall be effective unless contained in a
 writing executed by an authorized representative of each Party. No term or
-condition contained in Licensee's Purchase Order (“Deviating Terms”) shall apply
-unless The Qt Company has expressly agreed such Deviating Terms in writing.
-Unless and to the extent expressly agreed by The Qt Company, any such Deviating
-Terms shall be deemed void and with no legal effect. For clarity, delivery of
-the Licensed Software following the receipt of the Purchase Order including
-Deviating Terms shall not constitute acceptance of such Deviating Terms.”
-
-14.6 Force Majeure
+condition contained in Licensee's Purchase Order ("Deviating Terms") shall
+apply unless The Qt Company has expressly agreed such Deviating Terms in
+writing. Unless and to the extent expressly agreed by The Qt Company, any such
+Deviating Terms shall be deemed void and with no legal effect. For clarity,
+delivery of the Licensed Software following the receipt of the Purchase Order
+including Deviating Terms shall not constitute acceptance of such Deviating
+Terms."
+
+14.6. Force Majeure
 Except for the payment obligations hereunder, neither Party shall be liable to
 the other for any delay or non-performance of its obligations hereunder in the
-event and to the extent that such delay or non-performance is due to an event of
-act of God, terrorist attack or other similar unforeseeable catastrophic event
-that prevents either Party for fulfilling its obligations under this Agreement
-and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the
-Force Majeure Event results in a delay or non-performance of a Party for a
-period of three (3) months or longer, then either Party shall have the right to
-terminate this Agreement with immediate effect without any liability (except for
-the obligations of payment arising prior to the event of Force Majeure) towards
-the other Party.
-
-14.7 Notices
+event and to the extent that such delay or non-performance is due to an event
+of act of God, terrorist attack or other similar unforeseeable catastrophic
+event that prevents either Party for fulfilling its obligations under this
+Agreement and which such Party cannot avoid or circumvent ("Force Majeure
+Event"). If the Force Majeure Event results in a delay or non-performance of a
+Party for a period of three (3) months or longer, then either Party shall have
+the right to terminate this Agreement with immediate effect without any
+liability (except for the obligations of payment arising prior to the event of
+Force Majeure) towards the other Party.
+
+14.7. Notices
 Any notice given by one Party to the other shall be deemed properly given and
 deemed received if specifically acknowledged by the receiving Party in writing
-or when successfully delivered to the recipient by hand, fax, or special courier
-during normal business hours on a business day to the addresses specified for
-each Party on the signature page. Each communication and document made or
-delivered by one Party to the other Party pursuant to this Agreement shall be in
-the English language.
-
-14.8    Export Control
-Licensee acknowledges that the Redistributables, as incorporated in Applications
-or Devices, may be subject to export control restrictions under the applicable
-laws of respective countries.  Licensee shall fully comply with all applicable
-export license restrictions and requirements as well as with all laws and
-regulations relating to the Redistributables and exercise of licenses hereunder
-and shall procure all necessary governmental authorizations, including without
-limitation, all necessary licenses, approvals, permissions or consents, where
-necessary for the re-exportation of the Redistributables, Applications and/or
-Devices.
-
-14.9 No Implied License
+or when successfully delivered to the recipient by hand, fax, or special
+courier during normal business hours on a business day to the addresses
+specified for each Party on the signature page. Each communication and document
+made or delivered by one Party to the other Party pursuant to this Agreement
+shall be in the English language.
+
+14.8. Export Control
+Licensee acknowledges that the Redistributables, as incorporated in
+Applications or Devices, may be subject to export control restrictions under
+the applicable laws of respective countries. Licensee shall fully comply with
+all applicable export license restrictions and requirements as well as with all
+laws and regulations relating to the Redistributables and exercise of licenses
+hereunder and shall procure all necessary governmental authorizations,
+including without limitation, all necessary licenses, approvals, permissions or
+consents, where necessary for the re-exportation of the Redistributables,
+Applications and/or Devices.
+
+14.9. No Implied License
 There are no implied licenses or other implied rights granted under this
 Agreement, and all rights, save for those expressly granted hereunder, shall
 remain with The Qt Company and its licensors. In addition, no licenses or
 immunities are granted to the combination of the Licensed Software with any
 other software or hardware not delivered by The Qt Company under this Agreement.
 
-14.10 Attorney Fees
+14.10. Attorney Fees
 The prevailing Party in any action to enforce this Agreement shall be entitled
-to recover its attorney’s fees and costs in connection with such action.
+to recover its attorney's fees and costs in connection with such action.
 
-14.11 Privacy
+14.11. Privacy
 Licensee acknowledges and agrees that for the purpose of this Agreement, The Qt
 Company may collect, use, transfer and disclose personal data pertaining to
 Designated Users as well as any other employees and directors of the Licensee
-and its Contractors relevant for carrying out the intent of this Agreement. Such
-personal data may be collected from the Licensee or directly from the relevant
-individuals. The Parties acknowledge that with regard to such personal data
-processed hereunder, The Qt Company shall be regarded as the Data Controller
-under the applicable Data Protection Legislation. The Qt Company shall process
-any such personal data in accordance with its privacy policies and practices,
-which will comply with all applicable requirements of the Data Protection
-Legislation.
-
-14.12 Severability
-
+and its Contractors relevant for carrying out the intent of this Agreement.
+Such personal data may be collected from the Licensee or directly from the
+relevant individuals. The Parties acknowledge that with regard to such personal
+data processed hereunder, The Qt Company shall be regarded as the Data
+Controller under the applicable Data Protection Legislation. The Qt Company
+shall process any such personal data in accordance with its privacy policies
+and practices, which will comply with all applicable requirements of the Data
+Protection Legislation.
+
+14.12. Severability
 If any provision of this Agreement shall be adjudged by any court of competent
 jurisdiction to be unenforceable or invalid, that provision shall be limited or
 eliminated to the minimum extent necessary so that this Agreement shall
 otherwise remain in full force and effect and enforceable.
 
 
-APPENDICES
 
-This Agreement includes Appendix 1 or/and Appendix 8, and possibly one or more
-of the appendices 3-5, depending on the product(s) purchased by the Licensee,
-what is stated in the quote or invoice, and/or what is stated in the Licensee’s
-License Certificate.
-
-
-APPENDIX 1: LICENSED SOFTWARE
-
-1a. Licensed Software - Qt Toolkit
-
-Module                    Description
-Qt Core                   Core non-graphical classes used by other modules.
-Qt GUI                    Base classes for graphical user interface (GUI)
-                          components.
-Qt Multimedia             Classes for audio, video and camera functionality.
-Qt Multimedia Widgets     Widget-based classes for implementing multimedia
-                          functionality.
-Qt Network                Classes to make network programming easier and more
-                          portable.
-Qt QML                    Classes for QML and JavaScript languages.
-Qt Quick                  A declarative framework for building highly dynamic
-                          applications with custom user interfaces.
-Qt Quick Controls 2       Provides lightweight QML types for creating
-                          performant user interfaces for desktop, embedded,
-                          and mobile devices.
-Qt Quick Dialogs          Types for creating and interacting with system
-                          dialogs from a Qt Quick application.
-Qt Quick Layouts          Layouts are items that are used to arrange Qt Quick
-                          2 based items in the user interface.
-Qt Quick Test             A unit test framework for QML applications.
-Qt SQL                    Classes for database integration using SQL.
-Qt Test                   Classes for unit testing Qt applications and
-                          libraries.
-Qt Widgets                Classes to extend Qt GUI with C++ widgets.
-Active Qt                 Classes for applications which use ActiveX and COM
-Qt 3D                     Functionality for near-realtime simulation systems
-                          with support for 2D and 3D rendering.
-Qt Android Extras         Provides platform-specific APIs for Android.
-Qt Bluetooth              Provides access to Bluetooth hardware.
-Qt Canvas 3D              Enables OpenGL-like 3D drawing calls from Qt Quick
-                          applications using JavaScript.
-Qt Concurrent             Classes for writing multi-threaded programs without
-                          using low-level threading primitives.
-Qt D-Bus                  Classes for inter-process communication over the
-                          D-Bus protocol.
-Qt Gamepad                Enables Qt applications to support the use of gamepad
-                          hardware.
-Qt Graphical Effects      Graphical effects for use with Qt Quick 2.
-Qt Help                   Classes for integrating documentation into
-                          applications, similar to Qt Assistant.
-Qt Image                  Formats Plugins for additional image formats: TIFF,
-                          MNG, TGA, WBMP.
-Qt Location               Displays map, navigation, and place content in a QML
-                          application.
-Qt Mac Extras             Provides platform-specific APIs for macOS.
-Qt Network Authorization  Provides support for OAuth-based authorization to
-                          online services.
-Qt NFC                    Provides access to Near-Field communication (NFC)
-                          hardware.
-Qt Platform Headers       Provides classes that encapsulate platform-specific
-                          information.
-Qt Positioning            Provides access to position, satellite and area
-                          monitoring classes.
-Qt Print Support          Classes to make printing easier and more portable.
-Qt Purchasing             Enables in-app purchase of products in Qt
-                          applications.
-Qt for Python             Python bindings for Qt.
-Qt Quick Controls         Reusable Qt Quick based UI controls to create
-                          classic desktop-style user interfaces.
-Qt Quick Extras           Provides a specialized set of controls that can
-                          be used to build interfaces in Qt Quick.
-Qt Quick Widgets          Provides a C++ widget class for displaying a Qt
-                          Quick user interface.
-Qt SCXML                  Provides classes and tools for creating state
-                          machines from SCXML files.
-Qt Sensors                Provides access to sensor hardware and motion
-                          gesture recognition.
-Qt Serial Bus             Provides access to serial industrial bus interface.
-Qt Serial Port            Provides access to hardware and virtual serial ports.
-Qt Speech                 Provides support for accessibility features such as
-                          text-to-speech.
-Qt SVG                    Classes for displaying the contents of SVG files.
-Qt UI Tools               Classes for loading QWidget based forms created in
-                          Qt Designer dynamically, at runtime.
-Qt WebChannel             Provides access to QObject or QML objects from HTML
-                          clients for seamless integration of Qt applications
-                          with HTML/JavaScript clients.
-Qt WebEngine              Classes and functions for embedding web content in
-                          applications using the Chromium browser project.
-Qt WebSockets             Provides WebSocket communication.
-Qt WebView                Displays web content in a QML application by using
-                          APIs native to the platform.
-Qt Windows Extras         Provides platform-specific APIs for Windows.
-Qt X11 Extras             Provides platform-specific APIs for X11.
-Qt XML                    C++ implementations of SAX and DOM.
-Qt XML Patterns           Support for XPath, XQuery, XSLT and XML schema
-                          validation.
-Qt Wayland Compositor     Provides a framework to develop a Wayland compositor.
-Qt Charts UI              Components for displaying charts.
-Qt Data Visualization     UI Components for creating 3D data visualizations.
-Qt Virtual Keyboard       A framework for implementing different input methods
-                          as well as a QML virtual keyboard.
-
-
-1b. Licenses software – Embedded software development libraries
-
-Module                    Description
-Boot 2 Qt stack           Yocto based Embedded Linux stack for selected
-                          target hardware.
-Qt OTA                    Client-side capability for device image updates Over
-                          The Air.
-Device Utilities          Collection of API’s to manage the device; E.g.
-                          display, WiFi and Bluetooth settings.
-Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging,
-                          profiling and other features over USB. Up to developer
-                          to decide if this is left in the final solution.
-
-
-1c. Licensed Software - Qt Tools/Applications
-
-Tool                      Description
-Qt Creator                The integrated development environment for Qt.
-Qt Designer               Qt tool for designing and building graphical user
-                          interfaces.
-Qt Linguist               Tool used to add translations to Qt applications.
-Qt Assistant              Tool for viewing online documentation in Qt
-                          help-file format.
-Qmake                     Utility tool used to automate the generation of make
-                          files.
-uic                       User interface compiler for the Qt GUI toolkit.
-rcc                       Resource compiler used for embedding resources into
-                          Qt applications.
-lupdate                   Tool that finds the translatable strings in the
-                          specified source, header and Qt Designer interface
-                          files, and produces or updates translation files.
-lrelease                  Tool that produces translation files in the compact
-                          binary format used by localized Qt applications.
-qlalr                     Qt parser generator tool.
-qdoc                      Configurable documentation generation tool.
-qmlscene                  QML launcher tool.
-qmlviewer                 QML launcher tool.
-
-
-1d. Licenses software –Qt Tools/Applications specific to embedded software
-development
-
-Tool                      Description
-Target toolchains         Cross compilation toolchains for supported target
-                          devices and operating systems.
-Qt Debugging Bridge (QDB) Enables deployment, debugging, profiling and other
-Host Tools                features over USB from development host PC to target
-                          device.
-qtconfig-gui              Qt Lite Configurator tool graphical interface.
-Qt Emulator               Qt Emulator
-
-
-2. Parts of the Licensed Software that are permitted for distribution in
-object-code form only (“Redistributables”) under this Agreement:
-
-2a. Qt for Application Development
-
- -  The Licensed Software's Qt Toolkit libraries defined in 1a
- -  The Licensed Software's installer framework
-
-2b. Qt for Device Creation
-
- -  Qt for Application Development Redistributables defined in 2a
- -  The Licensed Software’s Embedded software development libraries defined
-    in 1b
-
-2c. Qt 3D Studio
-
--  The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”)
+APPENDICES
+The Agreement includes Appendix 1, and possibly one or more of the appendices
+3-5, depending on the product(s) purchased by the Licensee, what is stated in
+the quote or invoice, and/or what is stated in the Licensee's License
+Certificate.
 
 
-APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE
+APPENDIX 1
+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.
+
+Parts of the product that are permitted for distribution in object-code form
+only ("Redistributables") are marked with 'R' in the below table.
+
+Modules/Tools                          | QtAD  | QtDC  | QtMCU | Qt3DS | QtDS
+-------------------------------------------------------------------------------
+Qt Core                                |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt GUI                                 |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Multimedia                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Multimedia Widgets                  |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Network                             |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt QML                                 |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Quick                               |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Quick Controls 2                    |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Quick Dialogs                       |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Quick Layouts                       |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Quick Test                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt SQL                                 |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Test                                |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Widgets                             |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Active Qt                              |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt 3D                                  |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Android Extras                      |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Bluetooth                           |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Canvas 3D                           |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Concurrent                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt D-Bus                               |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Gamepad                             |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Graphical Effects                   |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Help                                |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Image Formats                       |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Location                            |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Mac Extras                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Network Authorization               |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt NFC                                 |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Platform Headers                    |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Positioning                         |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Print Support                       |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Purchasing                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt for Python                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Quick Controls                      |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Quick Extras                        |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Quick Widgets                       |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt SCXML                               |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Sensors                             |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Serial Bus                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Serial Port                         |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Speech                              |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt SVG                                 |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt UI Tools                            |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt WebChannel                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt WebEngine                           |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt WebSockets                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt WebView                             |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Windows Extras                      |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt X11 Extras                          |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt XML                                 |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt XML Patterns                        |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Wayland Compositor                  |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Charts                              |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Data Visualization                  |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Virtual Keyboard                    |  X,R  |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Boot 2 Qt stack                        |       |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt OTA                                 |       |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Device Utilities                       |       |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Debugging Bridge (QDB) Daemon       |       |  X,R  |       |       |
+-------------------------------------------------------------------------------
+Qt Quick Ultralite Controls            |       |       |  X,R  |       |
+-------------------------------------------------------------------------------
+Qt Quick Ultralite                     |       |       |  X,R  |       |
+-------------------------------------------------------------------------------
+Qt Creator                             |   X   |   X   |   X   |       |
+-------------------------------------------------------------------------------
+Qt Designer (Qt Widget Designer)       |   X   |   X   |       |       |
+-------------------------------------------------------------------------------
+Qt Quick Designer (Qt Creator plugin)  |   X   |   X   |   X   |       |
+-------------------------------------------------------------------------------
+Qt Linguist                            |   X   |   X   |   X   |       |
+-------------------------------------------------------------------------------
+Qt Assistant                           |   X   |   X   |   X   |       |
+-------------------------------------------------------------------------------
+lupdate                                |   X   |   X   |   X   |       |
+-------------------------------------------------------------------------------
+lrelease                               |   X   |   X   |   X   |       |
+-------------------------------------------------------------------------------
+qmake                                  |   X   |   X   |       |       |
+-------------------------------------------------------------------------------
+uic                                    |   X   |   X   |       |       |
+-------------------------------------------------------------------------------
+rcc                                    |   X   |   X   |       |       |
+-------------------------------------------------------------------------------
+qlalr                                  |   X   |   X   |       |       |
+-------------------------------------------------------------------------------
+qdoc                                   |   X   |   X   |       |       |
+-------------------------------------------------------------------------------
+qmlscene                               |   X   |   X   |       |       |
+-------------------------------------------------------------------------------
+qmlviewer                              |   X   |   X   |       |       |
+-------------------------------------------------------------------------------
+Target toolchains                      |       |   X   |   X   |       |
+-------------------------------------------------------------------------------
+Qt Debugging Bridge (QDB) Host Tools   |       |   X   |       |       |
+-------------------------------------------------------------------------------
+qtconfig-gui                           |       |   X   |       |       |
+-------------------------------------------------------------------------------
+Qt Emulator                            |       |   X   |       |       |
+-------------------------------------------------------------------------------
+qmlinterfacegenerator                  |       |       |   X   |       |
+-------------------------------------------------------------------------------
+qmltocpp                               |       |       |   X   |       |
+-------------------------------------------------------------------------------
+qulfontcompiler                        |       |       |   X   |       |
+-------------------------------------------------------------------------------
+Qt53DStudioRuntime2                    |       |       |       |  X,R  |
+-------------------------------------------------------------------------------
+Qt 3D Studio                           |       |       |       |   X   |
+-------------------------------------------------------------------------------
+Qt Design Studio                       |       |       |       |       |   X
+-------------------------------------------------------------------------------
 
-1. Licensed Software
 
+APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE
 In addition to what is provided under the definition of the Licensed Software,
-Parties agree that Licensed Software shall also include the following additional
-software products of The Qt Company if included in the quote / invoice:
-
-Additional software product       Description
-Qt for Automation                 A collection of software components and
-                                  libraries targeted for the development of
-                                  automation systems.
-Qt Safe Renderer                  Provides a UI rendering component that can be
-                                  used to render safety- critical items as well
-                                  as documentation and certification artifacts.
-Qt Application Manager            Daemon, that helps to create embedded Linux
-                                  systems that have a highly complex UI setup.
-GammaRay                          A software introspection tool for Qt
-                                  applications.
-
-
-2. Parts of the Licensed Software that are permitted for distribution in
-object-code form only (“Redistributables”) under this Agreement:
-
- -  Qt for Automation        The Licensed Software’s Qt for Automation
-                             libraries defined in 1
- -  Qt Safe Renderer         The Licensed Software’s Qt Safe Renderer
-                             libraries defined in 1
- -  Qt Application Manager   The Licensed Software’s Qt Application Manager
-                             libraries defined in 1
-
-All the above is considered as Redistributables and subject to applicable
-provisions and limitations including but not limited to what is defined in
-section 3.
-
-
-APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX
-
+Parties agree that Licensed Software shall also include the Add-On Products of
+The Qt Company, as mentioned in this Appendix, if included in the
+quote / 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. 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
+table.
+
+-------------------------------------------------------------------------------
+            |                          Add-On Product(s)
+Modules /   |------------------------------------------------------------------
+Tools of    |Qt for     |Qt         |Qt Safe  |Qt         |Qt       |Qt
+Licensed    |Automation |Automotive |Renderer |Application|Gammaray |Deployment
+Software    |           |Suite      |         |Manager    |         |Platform
+            |           |           |         |           |         |Package
+-------------------------------------------------------------------------------
+Qt MQTT     |   X,R     |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt KNX      |   X,R     |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt OPC UA   |   X,R     |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt CoAP     |   X,R     |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt Safe     |           |    X,R    |   X,R   |           |         |
+Renderer    |           |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt          |           |           |         |           |         |
+Application |           |    X,R    |         |    X,R    |         |
+Manager     |           |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt IVI      |           |    X,R    |         |           |         |
+-------------------------------------------------------------------------------
+Reference UI|           |    X,R    |         |           |         |
+-------------------------------------------------------------------------------
+Qt GENIVI   |           |    X,R    |         |           |         |
+Extras      |           |           |         |           |         |
+-------------------------------------------------------------------------------
+QML Live    |           |     X     |         |           |         |
+-------------------------------------------------------------------------------
+Qt Creator  |           |     X     |         |           |         |
+Deployment  |           |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt Creator  |           |           |         |           |         |
+Plugin for  |           |           |         |           |         |
+Qt          |           |     X     |         |     X     |         |
+Application |           |           |         |           |         |
+Manager     |           |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt          |           |           |         |           |         |
+Automotive  |           |           |         |           |         |
+Suite       |           |     X     |         |           |         |
+Deployment  |           |           |         |           |         |
+Server      |           |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt Design   |           |     X     |         |           |         |
+Studio      |           |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt 3D Studio|           |     X     |         |           |         |
+-------------------------------------------------------------------------------
+GammaRay    |           |     X     |         |           |    X    |
+-------------------------------------------------------------------------------
+Platform    |           |           |         |           |         |
+adaptations |           |           |         |           |         |
+for         |           |           |         |           |         |    X
+specified   |           |           |         |           |         |
+Deployment  |           |           |         |           |         |
+Platforms   |           |           |         |           |         |
+-------------------------------------------------------------------------------
+Qt for      |           |           |         |           |         |
+Device      |           |     X     |         |           |         |
+Creation    |           |           |         |           |         |
+-------------------------------------------------------------------------------
+
+All the above Redistributables are subject to applicable provisions and
+limitations including but not limited to what is defined in section 3 of the
+Agreement.
+
+
+APPENDIX 4: SMALL BUSINESS AND STARTUP
 The provisions of this Appendix 4 are applicable for Start-up Companies and for
-the Evaluation Term.
+the Evaluation Term.For the purpose of this Appendix 4, the following
+additional definitions shall be applicable:
 
-For the purpose of this Appendix 4, the following additional definitions shall
-be applicable:
-“Trial Term” shall mean a period of twelve (12) months.
+"Trial Term" shall mean a period of twelve (12) months.
 
-“Start-up Company” means a company with a maximum annual revenue, including
+"Start-up Company" means a company with a maximum annual revenue, including
 funding, equivalent to 100,000 USD (in applicable currency) during a respective
-calendar year, as evidenced by duly audited records of the Licensee and approved
-by The Qt Company.
+calendar year, as evidenced by duly audited records of the Licensee and
+approved by The Qt Company.
 
 During the Trial Term, Section 3 shall apply with following modifications
-(“Trial Term Modifications”):
-
- -  Licenses granted under Sections 3.1 and 3.2 shall be free of any charge.
-    For clarity, License for distribution of Devices pursuant to Section 3.3 is
-    subject to applicable License Fee for necessary Distribution Licenses;
- -  Development License under Section 3.1 is limited to a maximum of three (3)
-    Designated Users; and
- -  Support is available subject to availability, as judged by The Qt Company
-    at its free and absolute discretion, provided that support will be limited
-    to a maximum of ten (10) tickets during the Trial Term.
+("Trial Term Modifications"):
+    (i)     Licenses granted under Sections 3.1 and 3.2 shall be free of any
+            charge. For clarity, License for distribution of Devices pursuant
+            to Section 3.3 is subject to applicable License Fee for necessary
+            Distribution Licenses;
+    (ii)    Development License under Section 3.1 is limited to a maximum of
+            three (3) Designated Users; and
+    (iii)   Support is available subject to availability, as judged by The Qt
+            Company at its free and absolute discretion, provided that support
+            will be limited to a maximum of ten (10) tickets during the Trial
+            Term.
 
 Upon expiry of the Trial Term:
-
- a)  This Appendix 4 is terminated, Trial Term Modifications cease to remain in
-     force, Licensee’s Development Licenses shall be automatically converted
-     into licenses subject to a License Fee (in the amount specified in the
-     quote or in Appendix 2 and payable with a 30-day payment term) and
-     Licensee’s rights and obligations under this Agreement shall continue to
-     remain in force under the standard provisions of the Agreement, unless the
-     Licensee notifies The Qt Company in writing no less than ninety (90) days
-     before such expiry date that Licensee does not agree to such continuance,
-     in which event the Agreement, and all rights of the Licensee thereunder,
-     shall expire; provided however that
- b)  in the event the Licensee still qualifies as a Start-up Company, the
-     Licensee has an option (“Option”), instead of what is stated in item a)
-     above, to extend the Trial Term renewal is limited to one time and total
-     duration of Trial Terms thus to 24 months after the effective date.
-     Licensee shall notify The Qt Company in writing no less than ninety (90)
-     days before the expiry date, if Licensee wish to exercise the Option.
-
-
-APPENDIX 5: NON-COMMERCIAL USE APPENDIX
-
+    (a)     This Appendix 4 is terminated, Trial Term Modifications cease to
+            remain in force, Licensee's Development Licenses shall be
+            automatically converted into licenses subject to a License Fee (in
+            the amount specified in the quote or in Appendix 2 and payable with
+            a 30-day payment term) and Licensee's rights and obligations under
+            this Agreement shall continue to remain in force under the standard
+            provisions of the Agreement, unless the Licensee notifies The Qt
+            Company in writing no less than ninety (90) days before such expiry
+            date that Licensee does not agree to such continuance, in which
+            event the Agreement, and all rights of the Licensee thereunder,
+            shall expire; provided however that
+    (b)     in the event the Licensee still qualifies as a Start-up Company,
+            the Licensee has an option ("Option"), instead of what is stated in
+            item a) above, to renew the Trial Term. Renewal is limited to one
+            time, and the total duration of Trial Term is thus 24 months after
+            the effective date. Licensee shall notify The Qt Company in
+            writing, no less than ninety (90) days before the expiry date, if
+            Licensee wish to exercise the Option.
+
+
+APPENDIX 5: NON-COMMERCIAL USE
 The provisions of this Appendix 5 are applicable for non-commercial use of the
-Licensed Software by the Licensee.  For the purpose of this Appendix 5, the
-following additional definitions (replacing the relevant definition of the
-Agreement, where applicable) shall be applicable:
+Licensed Software by the Licensee.
 
-“Demo Units” shall mean
-   (i)   hardware development platform, which incorporates the Licensed
-         Software along with Licensee’s software and/or hardware, and
-   (ii)  prototype versions of Applications or Devices.
+For the purpose of this Appendix 5, the following additional definitions
+(replacing the relevant definition of the Agreement, where applicable) shall be
+applicable:
 
-“Designated User(s)” shall mean the employees and students of the Licensee.
+"Demo Units" shall mean (i) hardware development platform, which incorporates
+the Licensed Software along with Licensee's software and/or hardware, and (ii)
+prototype versions of Applications or Devices.
 
-“Licensee Products” shall mean Applications and/or Devices.
+"Designated User(s)" shall mean the employees and students of the Licensee.
 
-“Permitted Purpose” shall mean
-   (i)   Licensee’s internal evaluation and testing of Licensed Software,
-   (ii)  building Demo Units as well as
-   (iii) educational use.
+"Licensee Products" shall mean Applications and/or Devices.
 
-“Term” shall mean a period of twelve (12) months or any such other period as
+"Permitted Purpose" shall mean (i) Licensee's internal evaluation and testing
+of Licensed Software, (ii) building Demo Units as well as (iii) educational
+use.
+
+"Term" shall mean a period of twelve (12) months or any such other period as
 may be agreed between the Parties.
 
 For the purpose of this Appendix 5, the following changes shall be agreed with
 respect to relevant Sections of the Agreement:
-   I.   Recital (A) shall be replaced in its entirety to read as follows: “(A)
-        Licensee wishes to use the Licensed Software for the Permitted Purpose.”
-   II.  Section 3.1 shall be replaced in its entirety to read as follows: “The
-        Qt Company grants to Licensee a personal, non-exclusive,
-        non-transferable, revocable, royalty-free license, valid for the Term,
-        to use, modify and copy the Licensed Software solely for the Permitted
-        Purpose. Licensee may install copies of the Licensed Software on an
-        unlimited number of computers provided that only Designated Users may
-        use the Licensed Software. Licensee may demonstrate the Demo Units,
-        provided that such demonstrations must be conducted by Licensee, and
-        the Demo Units must remain in Licensee’s possession and under
-        Licensee’s control at all times. For clarity, this Agreement does not
-           (i) entitle Licensee to use Licensed Software to create Applications
-               or Devices (other than prototypes thereof) or
-           (ii) carry any distribution rights to Licensee, but such rights are
-                subject to and conditional upon conclusion of a separate
-                license agreement with The Qt Company.”
-   III. Sections 3.2, 3.3, 8 and 10 shall be deleted.
-   IV.  Section 3.4 shall be replaced in its entirety to read as follows:
-        “Licensee shall not:
-         -  remove or alter any copyright, trademark or other proprietary
-            rights notice contained in any portion of the Licensed Software;
-         -  transfer, publish, sublicense, disclose, display or otherwise make
-            the Licensed Software available to any third party (except that
-            Licensee may demonstrate the Demo Units pursuant to Section 3.1);
-         -  in any way combine, incorporate or integrate Licensed Software
-            with, or use Licensed Software for creation of, any software
-            created with or incorporating Open Source Qt;
-         -  Licensee shall cause all Designated Users who make use of the
-            licenses granted under this Agreement, to be contractually bound to
-            comply with the relevant terms of this Agreement and not to use the
-            Licensed Software beyond the terms hereof. Licensee shall be
-            responsible for any and all actions and omissions of its Designated
-            Users relating to the Licensed Software and use thereof.  Any use
-            of Licensed Software beyond the provisions of this Agreement is
-            strictly prohibited and requires an additional license from The Qt
-            Company.”
-   V.   Section 12 shall be replaced in its entirety to read as follows: “This
-        Agreement shall enter into force upon due acceptance by both Parties
-        and remain in force for the Term, unless and until terminated pursuant
-        to the terms of Section 12. Upon termination of the Agreement, Licensee
-        shall cease using the Licensed Software. All other copies of Licensed
-        Software in the possession or control of Licensee must be erased or
-        destroyed. An officer of Licensee must, upon request, promptly deliver
-        to The Qt Company a written confirmation that this has occurred.”
+    I.      Recital (A) shall be replaced in its entirety to read as follows:
 
-Except for the modifications specified above, this Appendix carries no change to
-the terms of the Agreement, which shall remain in full force.
+            "(A) Licensee wishes to use the Licensed Software for the Permitted
+            Purpose."
 
+    II.     Section 3.1 shall be replaced in its entirety to read as follows:
 
-APPENDIX 8: QT FOR DEVICE CREATION MCU APPENDIX
+            "The Qt Company grants to Licensee a personal, non-exclusive,
+            non-transferable, revocable, royalty-free license, valid for the
+            Term, to use, modify and copy the Licensed Software solely for the
+            Permitted Purpose.
 
-This Appendix 8 shall be applicable in case the Licensee and/or respective
-Designated User have purchased Qt for Device Creation MCU, either as an
-add-on or standalone package. In case Qt for Device Creation MCU is purchased
-as an addition to Qt for Device Creation, this appendix is an addition to
-Appendix 1. In any other case, this appendix replaces Appendix 1.
+            Licensee may install copies of the Licensed Software on an
+            unlimited number of computers provided that only Designated Users
+            may use the Licensed Software.
 
-1a. Licensed Software - Qt Toolkit
+            Licensee may demonstrate the Demo Units, provided that such
+            demonstrations must be conducted by Licensee, and the Demo Units
+            must remain in Licensee's possession and under Licensee's control
+            at all times.
 
-Module                    Description
-Qt Quick Controls 2       Provides lightweight QML types for creating
-                          performant user interfaces for desktop, embedded,
-                          and mobile devices.
+            For clarity, this Agreement does not (i) entitle Licensee to use
+            Licensed Software to create Applications or Devices (other than
+            prototypes thereof) or (ii) carry any distribution rights to
+            Licensee, but such rights are subject to and conditional upon
+            conclusion of a separate license agreement with The Qt Company."
 
+    III.    Sections 3.2, 3.3, 8 and 10 shall be deleted.
 
-1b. Licensed software – Embedded software development libraries
+    IV.     Section 3.4 shall be replaced in its entirety to read as follows:
 
-Module                    Description
-Qt Quick Ultralite        Qt Quick Ultralite (QUL) rendering engine and sample
-                          source codes.
-Qt Quick Ultralite        Platform adaptations including OS support that allow
-Platform Adaptations      applications on QUL to run on microcontrollers
+            "Licensee shall not:
+                - remove or alter any copyright, trademark or other proprietary
+                  rights notice contained in any portion of the Licensed
+                  Software;
 
+                - transfer, publish, sublicense, disclose, display or otherwise
+                  make the Licensed Software available to any third party
+                  (except that Licensee may demonstrate the Demo Units pursuant
+                  to Section 3.1);
 
-1c. Licensed Software - Qt Tools/Applications
+                - in any way combine, incorporate or integrate Licensed
+                  Software with, or use Licensed Software for creation of, any
+                  software created with or incorporating Open Source Qt;
 
-Tool                      Description
-Qt Creator                The integrated development environment for Qt.
-Qt Designer               Qt tool for designing and building graphical user
-                          interfaces.
-Qt Linguist               Tool used to add translations to Qt applications.
-Qt Assistant              Tool for viewing online documentation in Qt help-file
-                          format.
-lupdate                   Tool that finds the translatable strings in the
-                          specified source, header and Qt Designer interface
-                          files, and produces or updates translation files.
-lrelease                  Tool that produces translation files in the compact
-                          binary format used by localized Qt applications.
+            Licensee shall cause all Designated Users who make use of the
+            licenses granted under this Agreement, to be contractually bound to
+            comply with the relevant terms of this Agreement and not to use the
+            Licensed Software beyond the terms hereof. Licensee shall be
+            responsible for any and all actions and omissions of its Designated
+            Users relating to the Licensed Software and use thereof.
 
+            Any use of Licensed Software beyond the provisions of this
+            Agreement is strictly prohibited and requires an additional license
+            from The Qt Company."
 
-1d. Licensed software – Qt Tools/Applications specific to embedded software
-development
+    V.      Section 12 shall be replaced in its entirety to read as follows:
 
-Tool                      Description
-Target toolchains         Cross compilation toolchains for supported target
-                          devices and operating systems.
-qmlinterfaceextractor     Tool to generate QML from header file.
-qml2cpp                   Tool to convert QML to C++ files.
-fontcompiler              Tool to compile font meta data and True Type fonts.
+            "This Agreement shall enter into force upon due acceptance by both
+            Parties and remain in force for the Term, unless and until
+            terminated pursuant to the terms of Section 12.
 
+            Upon termination of the Agreement, Licensee shall cease using the
+            Licensed Software. All other copies of Licensed Software in the
+            possession or control of Licensee must be erased or destroyed. An
+            officer of Licensee must, upon request, promptly deliver to The Qt
+            Company a written confirmation that this has occurred."
 
-2. Parts of the Licensed Software that are permitted for distribution in
-object-code form only (“Redistributables”) under this Agreement:
+Except for the modifications specified above, this Appendix carries no change
+to the terms of the Agreement which shall remain in full force.
 
- -  The Licensed Software’s Embedded software development libraries
-    defined in 1b.
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index ff989c2f..4bf81339 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -36,12 +36,10 @@ SRC_URI += "\
     file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
     file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
     file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
     file://0013-Disable-ltcg-for-host_build.patch \
     file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
     file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
     file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
     file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
     file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
 "
@@ -197,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
 do_generate_qt_environment_file[umask] = "022"
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9"
+SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index daa19905..1669382e 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
 
-QT_MODULE_BRANCH = "2.7"
+QT_MODULE_BRANCH = "master"
 QT_MODULE_BRANCH_EASTL = "master"
 QT_GIT_PROJECT = "qt3dstudio"
-PV = "2.7.0+git${SRCPV}"
+PV = "2.8.0+git${SRCPV}"
 
 COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc64).*-linux"
 
@@ -22,7 +22,7 @@ SRC_URI += " \
     file://0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch \
 "
 
-SRCREV_ogl-runtime = "b9b52349d0df29e2eaa30dd13644b9f42d9e4f3e"
+SRCREV_ogl-runtime = "b53aeb784f950d7b2a5ebe38ea37c5bb6f456c9c"
 SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5"
 SRCREV = "${SRCREV_ogl-runtime}"
 
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 00c41813..310cf0ac 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -28,6 +28,7 @@ index c5232e116..cf5345352 100644
 +    sub_tools.depends -= sub_src
 +    SUBDIRS = sub_tools
 +}
+\ No newline at end of file
 diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
 index 8ba2d9a41..e973d93dd 100644
 --- a/src/3rdparty/assimp/assimp_dependency.pri
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 5f010680..294cffb4 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
          ${S}/src/quick3d/imports/input/importsinput.pro
 }
 
-SRCREV = "d1e6bd43de4883c7e40ca0efc10ff4735ba766c5"
+SRCREV = "34171b1d99f55fde1627df3c57eed50480ab2ae7"
 
 BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index be709f5f..f1d724dd 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
 # Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.15"
+QT_MODULE_BRANCH ?= "5.15.2"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
 
 # each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
 
 S = "${WORKDIR}/git"
 
-PV = "5.15.0+git${SRCPV}"
+PV = "5.15.2+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 7ed63851..4be4aaa8 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -31,12 +31,10 @@ SRC_URI += "\
     file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
     file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
     file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
     file://0013-Disable-ltcg-for-host_build.patch \
     file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
     file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
     file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
     file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
     file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
 "
@@ -144,4 +142,4 @@ do_install() {
     echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
 }
 
-SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9"
+SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index a8d85346..37e0a6a9 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
-From 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001
+From c97da220d95091386724e1eadc360ed16ed52dfe Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
 Subject: [PATCH] Add linux-oe-g++ platform
@@ -65,10 +65,10 @@ index 934a18a924..0f5b1b6333 100644
              msg = "test $$1 succeeded"
              write_file($$QMAKE_CONFIG_LOG, msg, append)
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 99b7fe6562..1ddfddb2bd 100644
+index 69d1954306..37f7c9c4a2 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) {
+@@ -151,7 +151,7 @@ import_plugins:qtConfig(static) {
              plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
              plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
              isEmpty(plug_path): \
@@ -77,7 +77,7 @@ index 99b7fe6562..1ddfddb2bd 100644
              LIBS += $$plug_path/$$plug_type/$$plug_name
          } else {
              LIBS += -l$${plug}$$qtPlatformTargetSuffix()
-@@ -271,8 +271,8 @@ for(ever) {
+@@ -274,8 +274,8 @@ for(ever) {
  # static builds: link qml import plugins into the target.
  contains(all_qt_module_deps, qml): \
          qtConfig(static):import_plugins:!host_build:!no_import_scan {
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
index f91792c0..751e59d7 100644
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
-From 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c Mon Sep 17 00:00:00 2001
+From 44e37eab48ff04bd20815fd4ae0b5d79d493aabc Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <denys@ti.com>
 Date: Tue, 25 Aug 2015 10:05:15 -0400
 Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index e775bf046e..a20eded987 100644
+index 49755f7abf..f84862d1ca 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -876,10 +876,10 @@ defineTest(qtConfOutput_preparePaths) {
+@@ -883,10 +883,10 @@ defineTest(qtConfOutput_preparePaths) {
  
      $${currentConfig}.output.qconfigSource = \
          "/* Installation Info */" \
diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
index 4353d43e..08a79898 100644
--- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
+++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
@@ -1,4 +1,4 @@
-From c4393e037ebfc6bfa1a58ceab29fdb78389cd47e Mon Sep 17 00:00:00 2001
+From 18904a169397f343e75bee5f29fa9ae1444a295f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 27 Jul 2017 08:02:51 -0700
 Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -36,7 +36,7 @@ index 19b3289390..4d0cdf8b5f 100644
              QMetaType info(tp);
              if (!info.isValid()) {
 diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
-index 6dd390ccbd..43b92606d9 100644
+index e397e80fe0..cdb7893e56 100644
 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 @@ -78,6 +78,7 @@
@@ -46,8 +46,8 @@ index 6dd390ccbd..43b92606d9 100644
 +#include <sched.h>
  #endif
  
- #include "private/qhostinfo_p.h"
-@@ -2199,8 +2200,8 @@ public slots:
+ #include <memory>
+@@ -2200,8 +2201,8 @@ public slots:
  
  #if defined(Q_OS_MAC)
          pthread_yield_np();
diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
deleted file mode 100644
index 147e304d..00000000
--- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 47d2068fa96173b68bcbc45a80a66d7c9cbf4775 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 14 Feb 2018 17:08:43 -0800
-Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem
-
--isystem fails to build when code uses include_next on certain files e.g.
-
-qtbase/5.10.0+gitAUTOINC+50117d738a-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory
- #include_next <stdlib.h>
-               ^~~~~~~~~~
-compilation terminated.
-make[2]: *** [Makefile:11592: .obj/qgenericpluginfactory.o] Error 1
-
-Upstream-Status: Pending
-
-Change-Id: Ia47832a6339a6ee59c0a6301fc5e552cd28b1029
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/common/clang.conf    | 2 +-
- mkspecs/common/gcc-base.conf | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
-index 2499c8b6d8..2e79e083cd 100644
---- a/mkspecs/common/clang.conf
-+++ b/mkspecs/common/clang.conf
-@@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT    = .pch
- 
- QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
- 
--QMAKE_CFLAGS_ISYSTEM             = -isystem
-+QMAKE_CFLAGS_ISYSTEM             =
- QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_LTCG                = -flto=thin
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..adf3fead32 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG         += -g
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
--QMAKE_CFLAGS_ISYSTEM        = -isystem
-+QMAKE_CFLAGS_ISYSTEM        =
- QMAKE_CFLAGS_YACC          += -Wno-unused -Wno-parentheses
- QMAKE_CFLAGS_HIDESYMS      += -fvisibility=hidden
- QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
diff --git a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
deleted file mode 100644
index 341be6ad..00000000
--- a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8e9c933cad3bd044b432b5557cf47a9ffea4e318 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Nov 2019 08:27:39 -0800
-Subject: [PATCH] input: Make use of timeval portable for 64bit time_t
-
-This patch avoids using time field of input_event structure which is not available
-on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new
-and keeps old input.h implementation functional as well.
-
-See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
-Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610]
-Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845
----
- .../input/evdevkeyboard/qevdevkeyboardhandler.cpp      | 10 +++++++++-
- .../input/evdevtouch/qevdevtouchhandler.cpp            |  7 ++++++-
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-index 3555763b89..e7dc57c027 100644
---- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-@@ -58,6 +58,11 @@
- #include <linux/input.h>
- #endif
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- QT_BEGIN_NAMESPACE
- 
- Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
-@@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state)
-     qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
- 
-     struct ::input_event led_ie;
--    ::gettimeofday(&led_ie.time, 0);
-+    struct timeval tval;
-+    ::gettimeofday(&tval, 0);
-+    led_ie.input_event_sec = tval.tv_sec;
-+    led_ie.input_event_usec = tval.tv_usec;
-     led_ie.type = EV_LED;
-     led_ie.code = led;
-     led_ie.value = state;
-diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-index 78728ef4ce..1d65f9b9f7 100644
---- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-@@ -58,6 +58,11 @@
- #include <linux/input.h>
- #endif
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- #include <math.h>
- 
- #if QT_CONFIG(mtdev)
-@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
- 
-         // update timestamps
-         m_lastTimeStamp = m_timeStamp;
--        m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0;
-+        m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0;
- 
-         m_lastTouchPoints = m_touchPoints;
-         m_touchPoints.clear();
diff --git a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
index c032ec03..69063457 100644
--- a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
+++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
@@ -1,4 +1,4 @@
-From 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001
+From 6c9e68cffb15cc1e848ca57ea12d4e5905d46507 Mon Sep 17 00:00:00 2001
 From: Nicola Lunghi <nick83ola@gmail.com>
 Date: Wed, 5 Feb 2020 15:32:25 +0000
 Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform
@@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894
  1 file changed, 37 insertions(+), 13 deletions(-)
 
 diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-index 45798cc527..de3f156cae 100644
+index 42e98ce363..0ca9b87f04 100644
 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
 +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-@@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages()
+@@ -2931,19 +2931,43 @@ void tst_QPainter::monoImages()
  #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__)
  #include <fenv.h>
  
@@ -67,7 +67,7 @@ index 45798cc527..de3f156cae 100644
          return QLatin1String("Invalid operation");
      return QLatin1String("No exception");
  }
-@@ -2932,7 +2956,7 @@ private:
+@@ -2969,7 +2993,7 @@ private:
  
  void fpe_rasterizeLine_task232012()
  {
@@ -76,7 +76,7 @@ index 45798cc527..de3f156cae 100644
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
      img.fill(0x0);
      QPainter p(&img);
-@@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012()
+@@ -2981,7 +3005,7 @@ void fpe_rasterizeLine_task232012()
  
  void fpe_pixmapTransform()
  {
@@ -85,7 +85,7 @@ index 45798cc527..de3f156cae 100644
  
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
  
-@@ -2972,7 +2996,7 @@ void fpe_pixmapTransform()
+@@ -3009,7 +3033,7 @@ void fpe_pixmapTransform()
  
  void fpe_zeroLengthLines()
  {
@@ -94,7 +94,7 @@ index 45798cc527..de3f156cae 100644
  
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
  
-@@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines()
+@@ -3021,7 +3045,7 @@ void fpe_zeroLengthLines()
  
  void fpe_divByZero()
  {
@@ -103,7 +103,7 @@ index 45798cc527..de3f156cae 100644
  
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
  
-@@ -3007,7 +3031,7 @@ void fpe_divByZero()
+@@ -3044,7 +3068,7 @@ void fpe_divByZero()
  
  void fpe_steepSlopes()
  {
@@ -112,7 +112,7 @@ index 45798cc527..de3f156cae 100644
  
      QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied);
  
-@@ -3026,7 +3050,7 @@ void fpe_steepSlopes()
+@@ -3063,7 +3087,7 @@ void fpe_steepSlopes()
  
  void fpe_radialGradients()
  {
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 2f1a9273..a7811ddf 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -27,12 +27,10 @@ SRC_URI += "\
     file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
     file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
     file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
     file://0013-Disable-ltcg-for-host_build.patch \
     file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
     file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
     file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
     file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
     file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
 "
@@ -60,6 +58,7 @@ PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev widgets tools libs freet
     ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
 "
 
 PACKAGECONFIG ?= " \
@@ -181,7 +180,6 @@ LDFLAGS_append_riscv64 = " -pthread"
 
 QT_CONFIG_FLAGS += " \
     ${QT_CONFIG_FLAGS_GOLD} \
-    -shared \
     -silent \
     -no-pch \
     -no-rpath \
@@ -304,4 +302,4 @@ sed -i \
     $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
 }
 
-SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9"
+SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index b3d2422f..1a5238f1 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
 
-SRCREV = "f74ba98f354e222211da5674294567282c088386"
+SRCREV = "a67f812548b008e3eedcd2bb9313828a195fd23b"
 
 # The same issue as in qtbase:
 # http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb
index d8ee7cad..83ee40b7 100644
--- a/recipes-qt/qt5/qtcoap_git.bb
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
 
 DEPENDS += "qtbase"
 
-SRCREV = "432c369082c581c81b60950bf7cfaf1a003c8681"
+SRCREV = "628d3b8abd47ffde45252cf6591ed10ec2fa28ac"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 364bd8f6..948f59a5 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "976a92fdd702e4d1afd5fd5cc1181d71978720c2"
+SRCREV = "ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 5c8526a3..70e14f06 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
 
-SRCREV = "64c75931c1aa7250a28a2f2493b5965ba26cc38e"
+SRCREV = "1168c788a117e4556e6cd0ba1e267a86ef62b0c4"
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
deleted file mode 100644
index 9ee83b39..00000000
--- a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From cfbc554f137ce5ee6497045fc23ebe8576361786 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 26 Nov 2019 21:10:03 -0800
-Subject: [PATCH] Use python3 explicitly
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- qtdeclarative.pro                         | 2 +-
- src/3rdparty/masm/masm.pri                | 4 ++--
- tests/auto/qml/ecmascripttests/test262.py | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/qtdeclarative.pro b/qtdeclarative.pro
-index 5b94da9b69..0e3496ce80 100644
---- a/qtdeclarative.pro
-+++ b/qtdeclarative.pro
-@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
- load(qt_parts)
- 
- !python_available {
--    py_out = $$system('python -c "print(1)"')
-+    py_out = $$system('python3 -c "print(1)"')
-     !equals(py_out, 1): error("Building QtQml requires Python.")
-     tmp = python_available
-     CONFIG += $$tmp
-diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
-index 1df4585aae..00038104ec 100644
---- a/src/3rdparty/masm/masm.pri
-+++ b/src/3rdparty/masm/masm.pri
-@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
-     udis86.output = udis86_itab.h
-     udis86.input = ITAB
-     udis86.CONFIG += no_link
--    udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
-+    udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
-     QMAKE_EXTRA_COMPILERS += udis86
- 
-     udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
-@@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
- retgen.script = $$PWD/yarr/create_regex_tables
- retgen.input = retgen.script
- retgen.CONFIG += no_link
--retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
-+retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
- QMAKE_EXTRA_COMPILERS += retgen
- 
- # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
-diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
-index 19551e3ba2..bf3f79a45f 100755
---- a/tests/auto/qml/ecmascripttests/test262.py
-+++ b/tests/auto/qml/ecmascripttests/test262.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #############################################################################
- ##
- ## Copyright (C) 2017 The Qt Company Ltd.
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 1a42b81d..3ff69d60 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = " \
 # 5.15.meta-qt5.1
 SRC_URI += " \
     file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
-    file://0002-Use-python3-explicitly.patch \
 "
 
 LDFLAGS_append_riscv64 = " -pthread"
@@ -33,6 +32,6 @@ do_install_append_class-nativesdk() {
     rm -rf ${D}${OE_QMAKE_PATH_QML}
 }
 
-SRCREV = "0fafffedf4857f6bdd8e54b72ab806594ef5674b"
+SRCREV = "104eae5b17b0ec700391e9539ee3a4f638588194"
 
 BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index c514a444..076f25a6 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "3c670af801d9ff2273e89e28d5dac8c2666a9d2c"
+SRCREV = "ff933a4e72826a77c81c4153f1adcf765ead35f0"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index d1edb0b6..9657a5ef 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
 # http://errors.yoctoproject.org/Errors/Build/44912/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "580ab04ff7a623193061f1fbe54bc2ae7744cfe8"
+SRCREV = "66b7fbaca4b323dce337e87e3093c8836577c561"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index acc98254..43db80ff 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "bb01d126bc1bfc2193a0bbe1e92587ff2aec65cd"
+SRCREV = "74a5bc4a45195b876454e596e76cb23aeb365410"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index 3d66e78a..9891eefb 100644
--- a/recipes-qt/qt5/qtknx_git.bb
+++ b/recipes-qt/qt5/qtknx_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "1ab6ae377230693817be63ee2768aaa6d586a00a"
+SRCREV = "0d2ce613010c0cc9c69f6821c06a34b6721482b4"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 450b3dd7..89d42813 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -35,7 +35,7 @@ SRC_URI += " \
     ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
 "
 
-SRCREV_qtlocation = "38eed6e327bb2fa115975a58e9866fc514b6f01c"
-SRCREV_qtlocation-mapboxgl = "d7e368c42f2ac7971e81f60b981e566352f1e4fa"
+SRCREV_qtlocation = "02a21217a9706402802f38c646797be8eccb86e4"
+SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d"
 
 SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb
index 00bd7811..b4a93300 100644
--- a/recipes-qt/qt5/qtlottie_git.bb
+++ b/recipes-qt/qt5/qtlottie_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "e40d61929ee0b8dde8b807e1a45e8067939f7db0"
+SRCREV = "b182dcd78a35b4667b2568857b7719d555c7fddb"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index ad5e80b9..b3db343e 100644
--- a/recipes-qt/qt5/qtmqtt_git.bb
+++ b/recipes-qt/qt5/qtmqtt_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "7c30a943b39696f673f72b7131d6395ab8bdbf40"
+SRCREV = "cade213f562049400da81e60762400df68d7c56b"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index d861b69f..fdbebd6d 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -38,7 +38,7 @@ SRC_URI += "\
 # http://errors.yoctoproject.org/Errors/Build/44914/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "040378a91fee4aa1e0740e1e5d3438e652b6f2eb"
+SRCREV = "fd30913d4601d12437404e1d20113a1ed6364ccc"
 
 # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
 do_install_append() {
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index af76e2b9..79d00544 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "0bbe1a2a2a345ab85cdef2fae900ae35eb8cc9cb"
+SRCREV = "fb2d6d47a0c961278d63309789a1141c3734818b"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index 75342799..7b3ae682 100644
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
 
 DEPENDS += "qtbase"
 
-SRCREV = "b32fd40e4ce5f530c1d41d9d11916605f1969518"
+SRCREV = "6d45793cae6f9e744c7bba82f905e431978ce3d0"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 5e19d5ab..554bb8f7 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "b80b526f8faf56ce529eeee1de5d62e809d1105c"
+SRCREV = "ddfa4d16243128d2871a51c513e025d518151b17"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index e6e3c53c..a56e26db 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
   ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
 "
 
-SRCREV_qtquick3d = "8e25bfb103fe9e619ab78af4a20eb6838026a6ec"
+SRCREV_qtquick3d = "2e05e6d6546635a8f25882c5140fb17697be0062"
 SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
 
 SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index c03083ff..fed17dad 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtdeclarative qtdeclarative-native"
 
-SRCREV = "7c3b169c73c58280b07f1b1a3d5b779d38f340b1"
+SRCREV = "16f27dfa3588c2bf377568ce00bf534af48c9558"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index b3969683..c2960096 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
   ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
 "
 
-SRCREV = "e8414d5bc37d1391f45af866055a8448acbb2271"
+SRCREV = "7c29283041a50def3ceca7de4471f211c9b30d4e"
diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb
index 3d0c2c54..61920c04 100644
--- a/recipes-qt/qt5/qtquicktimeline_git.bb
+++ b/recipes-qt/qt5/qtquicktimeline_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "qtbase qtdeclarative"
 
-SRCREV = "7848c053ff7e1ee4a0101c8f979b8accc4cf8308"
+SRCREV = "147ad75c589fc4804429710fdb177cc48a80dbea"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 363ef947..c9519137 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "121cc9f23b422127f0aa99d436a2e40bfcbd6255"
+SRCREV = "8e889442508e284691c923470eb4552c96afdfe3"
 
 BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index d9b979dc..773bc044 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
 # http://errors.yoctoproject.org/Errors/Build/44915/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "20aefbbae19be42e894f1bc2ecf951c5c32fca70"
+SRCREV = "5da7de1800eee3d604eb7e787b114479b61ffc93"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 467ed853..7a0975bf 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
 
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
 
-SRCREV = "126e70d6247ef345b4d49de6945111883e1212aa"
+SRCREV = "95aa78be795a862b95371afa75e1417029ec0a16"
 
 # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15
 # 5.15.meta-qt5.1
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index b21bc1f9..c4b90f84 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "32587e8b2b656710d90a36a8a856db14d9cc819b"
+SRCREV = "5618198e6df5e0224f79f786a44af7527b431545"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 2a4c5493..94e0fbbd 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
-SRCREV = "1b020b7d4ebf2de0f2d6641b067dfe3a6b9dfbfe"
+SRCREV = "1aa9b03756baead139943712839af5ecedeb2989"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index f69f56cb..b59d921d 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "430d7bc8c76bcf3154f87212811729eb484d9309"
+SRCREV = "192e376b01e65e7277772bdc94106613c22cf531"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 8e2f3786..52d82653 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "d0a46439a58a6630b4fd927347275ce2698097f9"
+SRCREV = "52d3788c7b0116ea3db232dccca5f1e3f1e229ac"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 117b9143..63566035 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -39,6 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \
     ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
     ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \
 "
-SRCREV = "6a85b6150554111f7d473d56addfe5a8b5da4400"
+SRCREV = "cc52debd905e0ed061290d6fd00a5f1ab67478a5"
 
 BBCLASSEXTEND = "native nativesdk"
+
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 26a98684..ecc9db2f 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
     ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
 "
 
-SRCREV = "383fe04ff98fb4b07e24e0c1addce380e0d12cfd"
+SRCREV = "cb1857418b36780b0444333f3aa6250ca3780f19"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index a124416f..c3b8a90f 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
 
-SRCREV = "39a9e7a6f72d14808a983ce1e678e22ee2fd57b5"
+SRCREV = "7b90415c58dd02c682a9ba317f273d7b3398ff88"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 481ed2ef..f3fea401 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -22,6 +22,7 @@ PACKAGECONFIG ?= " \
     wayland-server \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'wayland-egl', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'wayland-vulkan-server-buffer', '', d)} \
 "
 PACKAGECONFIG_class-native ?= ""
 PACKAGECONFIG_class-nativesdk ?= ""
@@ -38,10 +39,11 @@ PACKAGECONFIG[wayland-egl] = "-feature-wayland-egl,-no-feature-wayland-egl,virtu
 PACKAGECONFIG[wayland-brcm] = "-feature-wayland-brcm,-no-feature-wayland-brcm,virtual/egl"
 PACKAGECONFIG[wayland-drm-egl-server-buffer] = "-feature-wayland-drm-egl-server-buffer,-no-feature-wayland-drm-egl-server-buffer,libdrm virtual/egl"
 PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris-egl-server-buffer,-no-feature-wayland-libhybris-egl-server-buffer,libhybris"
+PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-buffer,-no-feature-wayland-vulkan-server-buffer,vulkan-headers"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "0f847b7688af376c22b1d040d0b140c88444d8bc"
+SRCREV = "3cc17177b1b03053276eb6236fda137c588261a7"
 
 BBCLASSEXTEND =+ "native nativesdk"
 
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index d5c173db..052bfd80 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtdeclarative qtwebsockets"
 
-SRCREV = "7e48e3bb4b4c61a37343e07cae5fd9fb8a5cddd7"
+SRCREV = "90cffd49575b075b0dc28440c693753d860fee87"
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
index f1fa3ed3..fa7de449 100644
--- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
@@ -1,4 +1,4 @@
-From 178aefa97fd7b725b1b802af7751df5f86a887af Mon Sep 17 00:00:00 2001
+From cc707f6c2d3dd152fcca23de0545351e99b3edcb Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 14 Dec 2017 11:28:10 +0200
 Subject: [PATCH] musl: link against libexecinfo
@@ -10,13 +10,13 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/core/core_module.pro b/src/core/core_module.pro
-index 5007012a..56c7ad4a 100644
+index 3b439e81..b1669e19 100644
 --- a/src/core/core_module.pro
 +++ b/src/core/core_module.pro
-@@ -57,7 +57,7 @@ linux {
- POST_TARGETDEPS += $$NINJA_TARGETDEPS
- 
+@@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri)
  
+ api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix()
+ api_library_path = $$OUT_PWD/api/$$getConfigDir()
 -LIBS_PRIVATE += -L$$api_library_path
 +LIBS_PRIVATE += -L$$api_library_path -lexecinfo
  CONFIG *= no_smart_library_merge
diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
index 8cb665f1..6bd374d8 100644
--- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -5,22 +5,44 @@ Subject: [PATCH] mkspecs: Allow builds with libc != glibc
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- src/buildtools/config/support.pri | 5 -----
- 1 file changed, 5 deletions(-)
+ src/buildtools/config/support.pri | 4 ----
+ src/buildtools/configure.json     | 4 +---
+ 2 files changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
-index 8077b12f..aaf4db47 100644
+index 6768f0a1..1885f1b4 100644
 --- a/src/buildtools/config/support.pri
 +++ b/src/buildtools/config/support.pri
-@@ -97,11 +97,6 @@ defineTest(qtwebengine_checkErrorForLinux) {
-         return(false)
-     }
+@@ -177,10 +177,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
  
+ defineTest(qtwebengine_checkForGlibc) {
+     module = $$1
 -    !qtConfig(webengine-system-glibc) {
--        qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.")
+-        qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.")
 -        return(false)
 -    }
--
-     !qtConfig(webengine-system-khr) {
-         qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)")
-         return(false)
+     return(true)
+ }
+ 
+diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
+index 96727a14..fef8fc5e 100644
+--- a/src/buildtools/configure.json
++++ b/src/buildtools/configure.json
+@@ -371,7 +371,6 @@
+                          && (!config.sanitizer || features.webengine-sanitizer)
+                          && (!config.linux || features.pkg-config)
+                          && (!config.linux || features.webengine-host-pkg-config)
+-                         && (!config.linux || features.webengine-system-glibc)
+                          && (!config.linux || features.webengine-system-khr)
+                          && (!config.linux || features.webengine-system-nss)
+                          && (!config.linux || features.webengine-system-dbus)
+@@ -732,8 +731,7 @@
+                         "webengine-system-fontconfig",
+                         "webengine-system-dbus",
+                         "webengine-system-nss",
+-                        "webengine-system-khr",
+-                        "webengine-system-glibc"
++                        "webengine-system-khr"
+                     ]
+                 },
+                 {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
index 3abe38b6..8b5d41ba 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
@@ -1,4 +1,4 @@
-From 105421c09f009b77019e60db2de22d5966a73602 Mon Sep 17 00:00:00 2001
+From 5af62581e5116b57efbe4bb7cc467efeb0aab941 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 30 Mar 2017 11:37:24 +0300
 Subject: [PATCH] chromium: workaround for too long .rps file name
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
index 497dd3b8..c93ba991 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
@@ -1,4 +1,4 @@
-From 99453086770508f96eeb95635dda3f9831c485bf Mon Sep 17 00:00:00 2001
+From 8dd7987fc70fd8dab4a9f7ee32334c8d28ed34e4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 23 Dec 2018 16:58:04 -0800
 Subject: [PATCH] chromium: stack pointer clobber
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
-index 8e0cc385792..d2bd9df4d40 100644
+index d2baee9d243..fd8efdffea6 100644
 --- a/chromium/third_party/lss/linux_syscall_support.h
 +++ b/chromium/third_party/lss/linux_syscall_support.h
-@@ -2012,7 +2012,7 @@ struct kernel_statfs {
+@@ -2017,7 +2017,7 @@ struct kernel_statfs {
                               : "i" (__NR_##name), "ri" ((long)(arg1)),        \
                                 "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                 "S" ((long)(arg4)), "D" ((long)(arg5))         \
@@ -29,7 +29,7 @@ index 8e0cc385792..d2bd9df4d40 100644
          LSS_RETURN(type,__res);                                               \
        }
      #undef  _syscall6
-@@ -2034,7 +2034,7 @@ struct kernel_statfs {
+@@ -2039,7 +2039,7 @@ struct kernel_statfs {
                               : "i" (__NR_##name),  "0" ((long)(&__s)),        \
                                 "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                 "S" ((long)(arg4)), "D" ((long)(arg5))         \
@@ -38,7 +38,7 @@ index 8e0cc385792..d2bd9df4d40 100644
          LSS_RETURN(type,__res);                                               \
        }
      LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
-@@ -2120,7 +2120,7 @@ struct kernel_statfs {
+@@ -2125,7 +2125,7 @@ struct kernel_statfs {
                             : "0"(-EINVAL), "i"(__NR_clone),
                               "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
                               "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
index 253cdaf6..a3f292c3 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -1,4 +1,4 @@
-From d3889654a28d901d345cae8fc8ec23988a085dab Mon Sep 17 00:00:00 2001
+From be18ba6e0b879fbd542f4e0d1a249f2ab5abb27c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 2 Feb 2019 19:28:59 -0800
 Subject: [PATCH] chromium: fix build with clang
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+), 25 deletions(-)
 
 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index fdfcf65f5ab..13d71d04030 100644
+index ca81bd8ce0f..d3c588b21e3 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -779,8 +779,6 @@ config("compiler_cpu_abi") {
+@@ -776,8 +776,6 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm") {
        if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index fdfcf65f5ab..13d71d04030 100644
        }
        if (!is_nacl) {
          cflags += [
-@@ -793,8 +791,6 @@ config("compiler_cpu_abi") {
+@@ -790,8 +788,6 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm64") {
        if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index fdfcf65f5ab..13d71d04030 100644
        }
      } else if (current_cpu == "mipsel" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
-@@ -803,9 +799,6 @@ config("compiler_cpu_abi") {
+@@ -800,9 +796,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mipsel-linux-android" ]
              ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index fdfcf65f5ab..13d71d04030 100644
            }
          } else {
            cflags += [ "-EL" ]
-@@ -884,10 +877,7 @@ config("compiler_cpu_abi") {
+@@ -881,10 +874,7 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "mips" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
@@ -53,7 +53,7 @@ index fdfcf65f5ab..13d71d04030 100644
            cflags += [ "-EB" ]
            ldflags += [ "-EB" ]
          }
-@@ -934,9 +924,6 @@ config("compiler_cpu_abi") {
+@@ -931,9 +921,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mips64el-linux-android" ]
              ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index fdfcf65f5ab..13d71d04030 100644
            }
          } else {
            cflags += [
-@@ -993,10 +980,7 @@ config("compiler_cpu_abi") {
+@@ -990,10 +977,7 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "mips64") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index fdfcf65f5ab..13d71d04030 100644
            cflags += [
              "-EB",
              "-mabi=64",
-@@ -1165,13 +1149,6 @@ config("compiler_deterministic") {
+@@ -1157,13 +1141,6 @@ config("compiler_deterministic") {
        }
      }
    }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
index 5b150b5f..c3de3cc5 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -1,4 +1,4 @@
-From 7a778d56065b041e55c60e500d5e60c71b7e345f Mon Sep 17 00:00:00 2001
+From 7eeed60fceeca490c5252e256baff08100e13259 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 5 Feb 2019 14:32:20 -0800
 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
-index 4422fecc0c8..1b398ad981a 100644
+index 00d1e7c6ca3..f2c36d72dd2 100644
 --- a/chromium/third_party/zlib/BUILD.gn
 +++ b/chromium/third_party/zlib/BUILD.gn
-@@ -80,8 +80,11 @@ if (use_arm_neon_optimizations) {
+@@ -86,8 +86,11 @@ if (use_arm_neon_optimizations) {
      # Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
      #  "All implementations of the ARMv8.1 architecture are required to
      #   implement the CRC32* instructions. These are optional in ARMv8.0."
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch
index 00293e5f..5f3f4528 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch
@@ -1,7 +1,8 @@
-From 7cabdbd5f444dc10f4c87ed554792e97a527075b Mon Sep 17 00:00:00 2001
+From 0faac107930255380ea07aa75267153022de2248 Mon Sep 17 00:00:00 2001
 From: Johannes Pointner <johannes.pointner@br-automation.com>
 Date: Fri, 3 May 2019 09:12:38 +0200
 Subject: [PATCH] chromium: Do not try to set the guessed values for
+
  march/mtune/float-abi OE config machinary has computed these values already
  and fed it via compiler cmdline to chromium build
 
@@ -12,15 +13,17 @@ Upstream-Status: Inappropriate [OE-Specific]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
+
+%% original patch: 0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
 ---
  chromium/build/config/compiler/BUILD.gn | 9 ---------
  1 file changed, 9 deletions(-)
 
 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index 13d71d04030..3ebcf1ddbc3 100644
+index d3c588b21e3..6d49fde33cc 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -780,15 +780,6 @@ config("compiler_cpu_abi") {
+@@ -777,15 +777,6 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "arm") {
        if (is_clang && !is_android && !is_nacl) {
        }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
index 798b5f05..f560e315 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
@@ -1,4 +1,4 @@
-From e7e0646f07d1c0dcf6502cd1c074d50839f3d461 Mon Sep 17 00:00:00 2001
+From 69abe5acb926cef9ac771015ade3873fa9985f3b Mon Sep 17 00:00:00 2001
 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 Date: Thu, 8 Mar 2018 15:39:55 +0100
 Subject: [PATCH] chromium: aarch64 skia build fix
@@ -28,7 +28,7 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
  1 file changed, 2 insertions(+), 15 deletions(-)
 
 diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
-index 0d610ccfe33..c1844b61168 100644
+index 831f5b3bb03..bb9377c3641 100644
 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
 +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
 @@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
index 307ce4d4..1c7a3b1e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -1,4 +1,4 @@
-From a5cdae084e84be8c847f4b0613b92e0462bbb038 Mon Sep 17 00:00:00 2001
+From 8a0cc2a6be8fb9f8c3f4976ad4b41b291e672a67 Mon Sep 17 00:00:00 2001
 From: Jiri Slaby <jslaby@suse.cz>
 Date: Thu, 11 Jul 2019 09:35:13 +0200
 Subject: [PATCH] chromium: fix build after y2038 changes in glibc
@@ -15,7 +15,7 @@ Upstream-Status: Pending
  1 file changed, 1 insertion(+)
 
 diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
-index ead4e57dc15..7ba975e660a 100644
+index 0cbcb8130c6..bc3dd3bddda 100644
 --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
 +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
 @@ -71,6 +71,7 @@ typedef void* SockOptArg;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index 03bdc05a..63a460cc 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From c769d6be7210a2fbc866e36f87ad21bcc91e9c6e Mon Sep 17 00:00:00 2001
+From ddedffaeb9f04ac8530f87f5010e0008dc548b96 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Nov 2019 10:07:43 -0800
 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
@@ -11,58 +11,37 @@ input.h [1]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- chromium/ui/events/ozone/evdev/event_converter_evdev.cc    | 4 ++--
- chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++---
- chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h  | 5 +++++
- 3 files changed, 10 insertions(+), 5 deletions(-)
+ chromium/ui/events/ozone/evdev/event_converter_evdev.h     | 5 +++++
+ chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-index 9f27d39e209..f565dd2ce5c 100644
---- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
- base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent(
-     const input_event& event) {
-   base::TimeTicks timestamp =
--      ui::EventTimeStampFromSeconds(event.time.tv_sec) +
--      base::TimeDelta::FromMicroseconds(event.time.tv_usec);
-+      ui::EventTimeStampFromSeconds(event.input_event_sec) +
-+      base::TimeDelta::FromMicroseconds(event.input_event_usec);
-   ValidateEventTimeClock(&timestamp);
-   return timestamp;
- }
+diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
+index 717410f2ebc..a4cd55ca20e 100644
+--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
++++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
+@@ -20,6 +20,11 @@
+ #include "ui/events/ozone/evdev/event_dispatch_callback.h"
+ #include "ui/gfx/geometry/size.h"
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ struct input_event;
+ 
+ namespace ui {
 diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
-index 363c3183e05..4fccfd62f84 100644
+index 01e49b7bbfd..4fccfd62f84 100644
 --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
 +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
-@@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
-   for (int i = 0; i < kDebugBufferSize; ++i) {
-     struct TouchEvent* te =
-         &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize];
--    if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0)
-+    if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0)
+@@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
        continue;
      std::string event_string = base::StringPrintf(
--        "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec,
--        te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
-+        "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
+         "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
+-        te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value,
+-        te->slot);
 +        te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
      report_content += event_string;
    }
    file.Write(0, report_content.c_str(), report_content.length());
-diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
-index 0d5b83148f6..1f17608e94d 100644
---- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
-+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
-@@ -14,6 +14,11 @@
- 
- #include "base/component_export.h"
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- namespace ui {
- 
- class EventDeviceInfo;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
index 3659f586..41a8ce36 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
-From 58783bf8f46657200643543f765f405a91699440 Mon Sep 17 00:00:00 2001
+From 022100d701dca71ecfe237e133712398bc1c59a7 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 25 Dec 2019 15:41:16 -0800
 Subject: [PATCH] chromium: Include cstddef for size_t definition
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-index b87fb2d0345..b3faffcfc79 100644
+index ec972949d89..2a76775cfb6 100644
 --- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
 +++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
  #include <map>
  #include <set>
  #include <vector>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
index 965ecd72..abe1e16d 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -1,4 +1,4 @@
-From faff740bb831e1a25c7acb1754df9bbd028330b9 Mon Sep 17 00:00:00 2001
+From 9d9db26e626e1c8d4d10eab1522daf0efc8cb11c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 2 Jan 2020 17:13:55 -0800
 Subject: [PATCH] chromium: Move CharAllocator definition to a header file
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
index a6abd037..464f952b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
@@ -1,4 +1,4 @@
-From 33005dfa49d65170fb006cd4ca4dbb8c6cf901e5 Mon Sep 17 00:00:00 2001
+From 1b8d57ba6595bbd743f6570d834f6a08600fb117 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 15 Jan 2020 16:53:46 -0800
 Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
index 169b4c9b..eaff07e0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
-From 910fe61d3ee439b26a6a33cc9f65e1f7a52f332d Mon Sep 17 00:00:00 2001
+From e60314a1257964bbebc0e7633d9799fd7c7ec35b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 1 Feb 2020 12:17:23 -0800
 Subject: [PATCH] chromium: Link v8 with libatomic on x86
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
-index 9107b302476..12d8171d238 100644
+index ab20142de9a..4ef4aa80cc0 100644
 --- a/chromium/v8/BUILD.gn
 +++ b/chromium/v8/BUILD.gn
-@@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") {
+@@ -3543,7 +3543,8 @@ v8_source_set("v8_base_without_compiler") {
    if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" ||
        v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" ||
        v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch
deleted file mode 100644
index 3272b727..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3ccc10f378ca26c35104e39e08771c053ae5b19e Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Fri, 14 Aug 2020 16:38:48 +0200
-Subject: [PATCH] chromium: Fix bison 3.7
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Do a replace run inspired by newer versions of the script.
-
-Fixes: QTBUG-86018
-Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1
-Reviewed-by: Michael Brüning <michael.bruning@qt.io>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../renderer/build/scripts/rule_bison.py      | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-index f75e25fd23f..7e0767e951a 100755
---- a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-+++ b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-@@ -45,6 +45,19 @@ from utilities import abs
- 
- from blinkbuild.name_style_converter import NameStyleConverter
- 
-+def modify_file(path, prefix_lines, suffix_lines, replace_list=[]):
-+    prefix_lines = map(lambda s: s + '\n', prefix_lines)
-+    suffix_lines = map(lambda s: s + '\n', suffix_lines)
-+    with open(path, 'r') as f:
-+        old_lines = f.readlines()
-+    for i in range(len(old_lines)):
-+        for src, dest in replace_list:
-+            old_lines[i] = old_lines[i].replace(src, dest)
-+    new_lines = prefix_lines + old_lines + suffix_lines
-+    with open(path, 'w') as f:
-+        f.writelines(new_lines)
-+
-+
- assert len(sys.argv) == 4 or len(sys.argv) == 5
- 
- inputFile = abs(sys.argv[1])
-@@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard
- print >>outputHFile, outputHContents
- print >>outputHFile, '#endif  // %s' % headerGuard
- outputHFile.close()
-+
-+common_replace_list = [(inputRoot + '.hh',
-+                        inputRoot + '.h')]
-+modify_file(
-+    outputCpp, [], [],
-+    replace_list=common_replace_list)
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
index 52607983..8a6660ff 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
@@ -1,4 +1,4 @@
-From 8c9a4027426b0a2c56cc834da0dbad5b8378c2c6 Mon Sep 17 00:00:00 2001
+From 344e8a3945a29239dd2f27ea4969e3d64d5d8911 Mon Sep 17 00:00:00 2001
 From: Andrej Valek <andrej.valek@siemens.com>
 Date: Fri, 17 Apr 2020 09:43:32 +0200
 Subject: [PATCH] chromium: icu: use system library only targets
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
-index 023d6e13a2c..312f34d6186 100644
+index 73673fa20ac..a656692c7bf 100644
 --- a/chromium/third_party/icu/BUILD.gn
 +++ b/chromium/third_party/icu/BUILD.gn
 @@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni")
@@ -37,9 +37,9 @@ index 023d6e13a2c..312f34d6186 100644
  }
  
  if (is_android) {
-@@ -20,6 +24,12 @@ if (is_mac) {
-   import("//build/config/sanitizers/sanitizers.gni")
- }
+@@ -23,6 +27,12 @@ if (is_mac) {
+ assert(!icu_disable_thin_archive || !is_component_build,
+        "icu_disable_thin_archive only works in static library builds")
  
 +if (use_system_icu) {
 +  # Use system library only for target, otherwise use bundled
@@ -50,7 +50,7 @@ index 023d6e13a2c..312f34d6186 100644
  # Meta target that includes both icuuc and icui18n. Most targets want both.
  # You can depend on the individually if you need to.
  group("icu") {
-@@ -1207,7 +1217,7 @@ config("system_icu_config") {
+@@ -1222,7 +1232,7 @@ config("system_icu_config") {
    }
  }
  
@@ -59,7 +59,7 @@ index 023d6e13a2c..312f34d6186 100644
    pkg_config("system_icui18n") {
      packages = [ "icu-i18n" ]
    }
-@@ -1420,7 +1430,7 @@ shim_headers("icuuc_shim") {
+@@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") {
  }
  
  config("icu_config") {
@@ -68,7 +68,7 @@ index 023d6e13a2c..312f34d6186 100644
      configs = [ ":system_icu_config"]
    } else {
      configs = [ ":bundled_icu_config"]
-@@ -1428,7 +1438,7 @@ config("icu_config") {
+@@ -1443,7 +1453,7 @@ config("icu_config") {
  }
  
  group("icuuc") {
@@ -77,7 +77,7 @@ index 023d6e13a2c..312f34d6186 100644
      deps = [ ":icuuc_shim" ]
      public_configs = [
        ":system_icu_config",
-@@ -1440,7 +1450,7 @@ group("icuuc") {
+@@ -1455,7 +1465,7 @@ group("icuuc") {
  }
  
  group("icui18n") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
deleted file mode 100644
index 2da3e09d..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1902fc967d6f900a4e918e56f21bc856a0462e4c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Jul 2017 15:12:39 -0700
-Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
- LinuxSigInfo
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc
-index 003708d2c89..0fef3148f9d 100644
---- a/chromium/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc
-@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
-   // most versions of glibc don't include this information in siginfo_t. So,
-   // we need to explicitly copy it into a arch_sigsys structure.
-   struct arch_sigsys sigsys;
--  memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
-+  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
- 
- #if defined(__mips__)
-   // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
index 04bf89e4..50d17413 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] chromium: musl: Adjust default pthread stack size
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- chromium/base/threading/platform_thread_linux.cc              | 3 ++-
- .../third_party/blink/renderer/platform/wtf/stack_util.cc     | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ chromium/base/threading/platform_thread_linux.cc               | 3 ++-
+ chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
-index 095c49b8dc0..d1479b54d48 100644
+index 74a01ad5af5..dab5773d73b 100644
 --- a/chromium/base/threading/platform_thread_linux.cc
 +++ b/chromium/base/threading/platform_thread_linux.cc
-@@ -186,7 +186,8 @@ void TerminateOnThread() {}
+@@ -377,7 +377,8 @@ void TerminateOnThread() {}
  
  size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
  #if !defined(THREAD_SANITIZER)
@@ -24,15 +24,15 @@ index 095c49b8dc0..d1479b54d48 100644
    // ThreadSanitizer bloats the stack heavily. Evidence has been that the
    // default stack size isn't enough for some browser tests.
 diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
-index b2421649ff3..a31b96e90e6 100644
+index ab1dff4167e..b0763b0bd9a 100644
 --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
 +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
 @@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
  // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
  // correctly for the main thread.
  
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
      defined(OS_FUCHSIA)
    // pthread_getattr_np() can fail if the thread is not invoked by
    // pthread_create() (e.g., the main thread of blink_unittests).
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
index e6fa0887..edeb3272 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
-index d2bd9df4d40..88ea7f508aa 100644
+index fd8efdffea6..22a8863031c 100644
 --- a/chromium/third_party/lss/linux_syscall_support.h
 +++ b/chromium/third_party/lss/linux_syscall_support.h
-@@ -1239,6 +1239,11 @@ struct kernel_statfs {
+@@ -1244,6 +1244,11 @@ struct kernel_statfs {
  #ifndef __NR_fallocate
  #define __NR_fallocate          285
  #endif
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
index 8db39395..72adf1cb 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc
-index 572472a6993..504fdb5d5c6 100644
+index 7df6892d67e..030ff8896e4 100644
 --- a/chromium/net/socket/udp_socket_posix.cc
 +++ b/chromium/net/socket/udp_socket_posix.cc
-@@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
+@@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
    for (auto& buffer : buffers)
      msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
    msgvec->reserve(buffers.size());
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index f87d96e8..6ba8ba4a 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -23,6 +23,8 @@ DEPENDS += " \
     qtlocation \
     libdrm fontconfig pixman openssl pango cairo pciutils nss \
     libcap \
+    jpeg-native \
+    freetype-native \
     gperf-native \
     ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \
@@ -43,7 +45,7 @@ SECURITY_STRINGFORMAT = ""
 
 # To use system ffmpeg you need to enable also libwebp, opus, vpx
 # Only depenedencies available in oe-core are enabled by default
-PACKAGECONFIG ??= "libwebp libevent libpng \
+PACKAGECONFIG ??= "libevent libpng \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
 
 PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu"
@@ -142,7 +144,7 @@ RDEPENDS_${PN}-examples += " \
     qtdeclarative-qmlplugins \
 "
 
-QT_MODULE_BRANCH_CHROMIUM = "80-based"
+QT_MODULE_BRANCH_CHROMIUM = "83-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc
 # 5.15-glibc.meta-qt5.8
@@ -165,7 +167,7 @@ SRC_URI += " \
     file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
     file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
     file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
-    file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
+    file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch;patchdir=src/3rdparty \
     file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \
     file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \
     file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \
@@ -173,7 +175,6 @@ SRC_URI += " \
     file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \
     file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \
     file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \
-    file://chromium/0013-chromium-Fix-bison-3.7.patch;patchdir=src/3rdparty \
     file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \
     file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \
     file://chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch;patchdir=src/3rdparty \
@@ -188,7 +189,6 @@ SRC_URI_append_libc-musl = "\
     file://chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
     file://chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
     file://chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
-    file://chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
     file://chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
     file://chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
     file://chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
@@ -198,8 +198,8 @@ SRC_URI_append_libc-musl = "\
     file://chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
 "
 
-SRCREV_qtwebengine = "f5268555099a1a96f8730035a40f04a473dd396e"
-SRCREV_chromium = "7b2f027ea83c372c33d5b50deb65a2d98244aa04"
+SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc"
+SRCREV_chromium = "fb6ab5e483876298235be1c6a6013b426c82b759"
 SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index 97535926..fd14851a 100644
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -18,4 +18,4 @@ do_configure_prepend() {
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
 
-SRCREV = "a76d0002b75ecf0ed9ef6ddb1b96056aa324eed7"
+SRCREV = "5e41e564aaf96b7e49403af5099995efbe4cac8e"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 2fa3b39d..c84f7828 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "652818acf91b6447270d667cb9792ffcf066878f"
+SRCREV = "f73735911b2124ef16aa39228bf8f89ee900ba5d"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 66e434c1..fcabec7a 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -23,4 +23,4 @@ python() {
     if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
         raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
 }
-SRCREV = "3db7be97488c19e34360bc48cb46605d51876e15"
+SRCREV = "800926cc4e0ecfdb37a3b34486403354b66a37a4"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 3234aeb1..8a24f2f7 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "c8623a37ace095375139500c929d268139ec317a"
+SRCREV = "9bb0adeac84da6723cf57a2bb0d0c3b405691a15"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index cae45f9c..f5db658d 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,6 +25,6 @@ do_configure_prepend() {
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
 
-SRCREV = "27b65209cb65164fbd889bf3a29d2968e0c78f45"
+SRCREV = "50421402f05b3ee3c76c6cff455a69efaf576b6d"
 
 BBCLASSEXTEND =+ "native nativesdk"