diff options
84 files changed, 1496 insertions, 958 deletions
diff --git a/licenses/The-Qt-Company-Commercial b/licenses/The-Qt-Company-Commercial index 19a20ea4..386577c6 100644 --- a/licenses/The-Qt-Company-Commercial +++ b/licenses/The-Qt-Company-Commercial @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.2.1 +Agreement version 4.3 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -19,26 +19,27 @@ 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. + +"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 +(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 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 indirectly, distributes copies of the Redistributables. @@ -54,41 +55,39 @@ 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. +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 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 per +respective Licensed Software products, each product having its designated scope +and purpose of use. Distribution Licenses are always connected to Qt for Device +Creation product and Qt for MCUs product only. "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. +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. +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, 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. +ursuant 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), design patents, and designs (whether or not capable of registration), chip @@ -101,10 +100,10 @@ well as any trade secrets. each Designated User respectively upon them downloading the Licensed Software, 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 under the terms of this Agreement. @@ -115,39 +114,39 @@ 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) Qt for MCUs, and/or - (vi) selected Add-on Products, if any, + (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 (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). +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. +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. -"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. @@ -196,12 +195,12 @@ and refer also to Redistributables. "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 +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. @@ -210,39 +209,39 @@ hereunder. "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. + (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. +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. +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. @@ -251,43 +250,47 @@ exclusive property of The Qt Company or its licensors respectively. 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). +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 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 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, +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 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. Each +Application and/or Device can only include, incorporate or integrate code +generated under this Agreement by such Designated Users who are duly licensed +for the applicable Development Platform(s) and Deployment Platform(s) (i.e have +a valid license for the appropriate Licensed Software product). 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 @@ -299,50 +302,54 @@ 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. +until either Party notifies the other Party in writing, or any other method +acceptable to The Qt Company, that it does not wish to continue the License +Term, such notification to be provided to the other Party no less than thirty +(30) days before expiry of the respective License Term. + +Unless otherwise agreed between the Parties, Renewal Term shall be of equal +length with the initial License Term. 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. +Any price or other term specified for a Renewal Term shall be valid only for the +specified time. -The Qt Company may request the Licensee to place a purchase order corresponding -to a quote by The Qt Company for the relevant Renewal Term. +The Qt Company may either request the Licensee to place a purchase order +corresponding to a quote by The Qt Company, or uses Licensees stored Credit +Card information in the QtAccount to automatically charge the Licensee for the +relevant Renewal Term. In the event Licensee does not prevent auto-renewal pursuant the above, but a Renewal Term is nevertheless not duly ordered within 30 days from the date of -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 +the respective notification 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 +Term by notifying The Qt Company thereof no less than thirty (30) 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. +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 +Subject to the terms of this Agreement, The Qt Company grants to Licensee +a 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 @@ -353,102 +360,97 @@ time of distribution of any Redistributables to Customers. Subject to the terms of this Agreement, The Qt Company grants to Licensee a 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 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. + (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 Licensed Software with any + Permitted Software; + (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 @@ -460,15 +462,16 @@ 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, @@ -476,15 +479,16 @@ 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. -For clarity, unless Licensed Software specifies different license terms for the -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. +For clarity, unless Licensed Software specifies different license terms for +the 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. 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. @@ -493,20 +497,21 @@ 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 +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 -IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE -UNINTERRUPTED. +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 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 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 @@ -517,10 +522,10 @@ 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. +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 @@ -532,6 +537,7 @@ 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 receive Support and Updates and to use the Online Services during the License Term, provided, however, that in the event the License Term is longer than 36 @@ -550,30 +556,32 @@ 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. +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; (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 @@ -587,10 +595,11 @@ 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. +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. @@ -600,30 +609,32 @@ 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. -Unless specifically otherwise provided, any pricing terms referenced in this -Agreement shall be valid for twelve (12) months from the date of this Agreement. +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") -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. +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") for confirmation, whereupon the Purchase Order shall +become binding between the Parties. 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. +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. +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 @@ -639,104 +650,114 @@ 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. +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 -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, -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 -information as The Qt Company may reasonably require from time to time. +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 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, 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 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 -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 -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. +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 during regular business hours at +Licensee's facilities and shall not unreasonably interfere with Licensee's +usiness 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 -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 -the terms of this Section 12. +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 the terms of this Section 12. 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. +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, -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. +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. 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 +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. + (i) as a result of The Qt Company choosing not to renew the Development + License(s) as set forth in Section 3.1, and where such decision of + non-renewal is not due to any ongoing breach or alleged breach (as + reasonably determined by The Qt Company) by Licensee of the terms of this + Agreement or any applicable license terms of Open Source Qt, then all valid + licenses possessed by the Licensee at such date shall be extended to be + valid in perpetuity under the terms of this Agreement and Licensee is + entitled to purchase additional licenses as set forth in Section 10.2; or + (ii) for reason other than by The Qt Company pursuant to item (i) above + or pursuant to Section 12.2, then the Licensee is entitled, for a + period of six (6) months after the effective date of termination, + 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 @@ -749,65 +770,66 @@ 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). +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. +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. 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 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. +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 @@ -821,511 +843,473 @@ 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. +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. +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. +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." +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. +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 -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. +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. +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. +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 -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. +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. 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. +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 -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. - - +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 -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. +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 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 -------------------------------------------------------------------------------- + +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. The modules and tools are ported to Qt 6 +in stages and are subject to availability. + +Parts of the product that are permitted for distribution in object-code +form only ("Redistributables") are marked with 'R' in the below table. + ++-----------------------------------------------------------------------+ +| 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 PDF | 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 | X, R | X, R | X, R | | | +| plugin) | | | | | | ++-----------------------------------------------------------------------+ +| Qt Linguist | X, R | X, R | X, R | | | ++-----------------------------------------------------------------------+ +| Qt Assistant | X, R | X, R | X, R | | | ++-----------------------------------------------------------------------+ +| Lupdate | X, R | X, R | X, R | | | ++-----------------------------------------------------------------------+ +| Lrelease | X, R | X, R | X, R | | | ++-----------------------------------------------------------------------+ +| 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 | | X | | | | +| Tools | | | | | | ++-----------------------------------------------------------------------+ +| qtconfig-gui | | X | | | | ++-----------------------------------------------------------------------+ +| Qt Emulator | | X | | | | ++-----------------------------------------------------------------------+ +| Qmlinterfacegenerator | | | X | | | ++-----------------------------------------------------------------------+ +| Qmltocpp | | | X | | | ++-----------------------------------------------------------------------+ +| qulfontcompiler | | | X | | | ++-----------------------------------------------------------------------+ +| Qt53DStudioRuntime2 | | | | X, R | | ++-----------------------------------------------------------------------+ +| Qt 3D Studio | | | | X | | ++-----------------------------------------------------------------------+ +| Qt Design Studio | | | | | X | ++-----------------------------------------------------------------------+ 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 Add-On Products of -The Qt Company, as mentioned in this Appendix, if included in the -quote / invoice. +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 +Add-On Product respectively are marked with 'X' in the below table. The modules +are ported to Qt 6 in stages and are subject to availability. + +Parts of the respective Add-On Product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below 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 | | | | | | -------------------------------------------------------------------------------- ++------------------------------------------------------------------------------------------------+ +| | Add-On Product(s) | +| +--------------------------------------------------------------------------+ +| Modules / Tools of | Qt for | Qt | Qt | Qt | Qt | Qt | +| Licensed Software | Automation | Automotive | Safe | Application | GammaRay | Deployment | +| | / Qt M2M | Suite | Renderer | Manager | | Platform | +| | Protocols | | | | | Package | ++------------------------------------------------------------------------------------------------+ +| Qt MQTT | X, R | | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt KNX | X, R | | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt OPC UA | X, R | | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt CoAP | X, R | | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt Safe Renderer | | X, R | X, R | | | | ++------------------------------------------------------------------------------------------------+ +| Qt Application | | X, R | | X, R | | | +| Manager | | | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt IVI | | X, R | | | | | ++------------------------------------------------------------------------------------------------+ +| Reference UI | | X, R | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt GENIVI Extras | | X, R | | | | | ++------------------------------------------------------------------------------------------------+ +| QML Live | | X | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt Creator | | X | | | | | +| Deployment | | | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt Creator Plugin | | X | | X | | | +| for Qt Application Manager | | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt Automotive Suite | | X | | | | | +| Deployment Server | | | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt Design Studio | | X | | | | | ++------------------------------------------------------------------------------------------------+ +| Qt 3D Studio | | X | | | | | ++------------------------------------------------------------------------------------------------+ +| GammaRay | | X | | | X | | ++------------------------------------------------------------------------------------------------+ +| Platform adaptations| | | | | | X | +| for 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.For the purpose of this Appendix 4, the following -additional definitions shall be applicable: - -"Trial Term" shall mean a period of twelve (12) months. - -"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. - -During the Trial Term, Section 3 shall apply with following modifications -("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 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. +The provisions of this Appendix 4 are applicable for companies with an annual +revenue, including funding, equivalent to maximum of 250,000 USD (in +applicable currency) during the latest full calendar year, as evidenced by +duly audited records of the Licensee and approved by The Qt Company +("Start-up Company"). + +Start-up Companies are qualified for a discounted License Fee for maximum of +four (4) Development Licenses ("Start-up Development License") unless +otherwise agreed between the parties. + +Start-up Development License entitles the respective Designated User for +Support only for installation related issues. + +Upon expiry of the respective License Term, the Start-up Development +Licenses shall be automatically extended, pursuant to Section 3.1 of the +Agreement, for a Renewal Term either as new Start-up Development Licenses +(if the Licensee still qualifies as a Start-up Company), or as normal +Development Licenses (if the Licensee no longer qualifies as a Start-up +ompany). APPENDIX 5: NON-COMMERCIAL USE -The provisions of this Appendix 5 are applicable for non-commercial use of the -Licensed Software by the Licensee. +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: +(replacing the relevant definition of the Agreement, where applicable) +shall be applicable: "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. +the Licensed Software along with Licensee's software and/or hardware, and +(ii) prototype versions of Applications or Devices. "Designated User(s)" shall mean the employees and students of the Licensee. "Licensee Products" shall mean Applications and/or Devices. -"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." - -Except for the modifications specified above, this Appendix carries no change -to the terms of the Agreement which shall remain in full force. - +"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 five (5) + computers per Designated User, provided that only the Designated + Users who have a valid Development License 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." + +Except for the modifications specified above, this Appendix carries no +change to the terms of the Agreement which shall remain in full force. diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb index f9fa27cd..4b56d21c 100644 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb @@ -8,7 +8,7 @@ DEPENDS += "qtbase qtdeclarative" PV = "1.2.7+git${SRCPV}" SRCREV = "ad7fef1c35a3e897913965f73b879a14d65043dd" -SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ +SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https;branch=master \ file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ file://0001-Fix-library-path-for-multilib-setups.patch \ " diff --git a/recipes-connectivity/libqofono/libqofono_git.bb b/recipes-connectivity/libqofono/libqofono_git.bb index 7de0e49b..2c39520b 100644 --- a/recipes-connectivity/libqofono/libqofono_git.bb +++ b/recipes-connectivity/libqofono/libqofono_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS += "qtbase qtdeclarative qtxmlpatterns" SRCREV = "3581a6e85561da85858e1b90bef9be88b87acc4d" -SRC_URI = "git://git.merproject.org/mer-core/libqofono.git \ +SRC_URI = "git://git.merproject.org/mer-core/libqofono.git;branch=master \ file://0001-also-emit-modemRemoved-and-modemAdded.patch \ " S = "${WORKDIR}/git" diff --git a/recipes-connectivity/libvcard/libvcard_git.bb b/recipes-connectivity/libvcard/libvcard_git.bb index 58189ede..776d7d0a 100644 --- a/recipes-connectivity/libvcard/libvcard_git.bb +++ b/recipes-connectivity/libvcard/libvcard_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f94eaed54ffa1718d593504bae740faf" DEPENDS += "qtbase" SRCREV = "4250e2468552ea01954244a2d9cd5d2b44b00042" -SRC_URI = "git://github.com/pol51/libvcard.git;protocol=https" +SRC_URI = "git://github.com/pol51/libvcard.git;protocol=https;branch=master" PV = "1.0+gitr${SRCPV}" diff --git a/recipes-qt/examples/qt5-opengles2-test_git.bb b/recipes-qt/examples/qt5-opengles2-test_git.bb index 5da25dc9..f617ee7b 100644 --- a/recipes-qt/examples/qt5-opengles2-test_git.bb +++ b/recipes-qt/examples/qt5-opengles2-test_git.bb @@ -12,7 +12,7 @@ DEPENDS = "qtbase qtsensors" # Depends on gles2 enabled and that's not default configuration EXCLUDE_FROM_WORLD = "1" -SRC_URI = "git://github.com/smk-embedded/qt5-opengles2-test.git" +SRC_URI = "git://github.com/smk-embedded/qt5-opengles2-test.git;branch=master;protocol=https" SRCREV = "938390507054ed1258345f70ed55770d2fe56176" S = "${WORKDIR}/git" diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index 308f3d02..de8f921a 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -4,9 +4,9 @@ HOMEPAGE = "https://wiki.maliit.org/Main_Page" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad" -inherit qmake5 qmake5_paths +inherit qmake5 qmake5_paths pkgconfig -SRC_URI = "git://github.com/maliit/framework.git;branch=master \ +SRC_URI = "git://github.com/maliit/framework.git;branch=master;protocol=https \ file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \ file://maliit-server.desktop \ file://0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch \ diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb index 8464e1f0..62a197b6 100644 --- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb +++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb @@ -10,7 +10,7 @@ DEPENDS = "maliit-framework-qt5" RDEPENDS_${PN} += "qtsvg-plugins" -SRC_URI = "git://github.com/maliit/plugins.git;branch=master \ +SRC_URI = "git://github.com/maliit/plugins.git;branch=master;protocol=https \ file://0001-Do-not-use-tr1-namespace.patch \ " diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb index e92cb9d4..03e294fd 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb @@ -3,7 +3,7 @@ SUMMARY = "Host packages for the Qt5 standalone SDK or external toolchain" LICENSE = "MIT" -inherit nativesdk packagegroup +inherit packagegroup nativesdk PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" diff --git a/recipes-qt/qsiv/qsiv_1.1.bb b/recipes-qt/qsiv/qsiv_1.1.bb index 5773c3e7..ea2b851f 100644 --- a/recipes-qt/qsiv/qsiv_1.1.bb +++ b/recipes-qt/qsiv/qsiv_1.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=11c7965a9059e287de5d93b98adf6d1a" DEPENDS = "qtdeclarative" SRCREV = "7b9810b0f02f9ac74fae3ead6e2e9fb5c1382173" -SRC_URI = "git://code.ossystems.com.br/qt/qsiv;protocol=http" +SRC_URI = "git://code.ossystems.com.br/qt/qsiv;protocol=http;branch=master" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/nativesdk-qt5.inc b/recipes-qt/qt5/nativesdk-qt5.inc index 2eb8c142..5472012c 100644 --- a/recipes-qt/qt5/nativesdk-qt5.inc +++ b/recipes-qt/qt5/nativesdk-qt5.inc @@ -1,4 +1,4 @@ -inherit nativesdk qmake5_base +inherit qmake5_base nativesdk # we don't want conflicts with qt4 OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index f043198a..93b4b9f1 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = " \ QT_MODULE = "qtbase" +inherit pkgconfig + require nativesdk-qt5.inc require qt5-git.inc @@ -23,7 +25,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.9 +# 5.12.meta-qt5-shared.12 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -42,14 +44,15 @@ SRC_URI += "\ 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-Fix-Wdeprecated-copy-warnings.patch \ + file://0018-qfloat16-Include-limits-header.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.9 +# 5.12.meta-qt5-native.12 SRC_URI += " \ - file://0018-Always-build-uic-and-qvkgen.patch \ - file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0019-Always-build-uic-and-qvkgen.patch \ + file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -194,4 +197,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 = "c919fc5f65c1c509370df7e616263ed007931a7a" +SRCREV = "01272c0948be9f1c6b8a3eff328b931f47d38649" diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index a2be5526..236b175f 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -9,17 +9,17 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtquickcontrols2" -QT_MODULE_BRANCH = "2.6" +QT_MODULE_BRANCH = "master" QT_MODULE_BRANCH_EASTL = "master" QT_GIT_PROJECT = "qt3dstudio" -PV = "2.6.0+git${SRCPV}" +PV = "2.8.0+git${SRCPV}" SRC_URI += " \ ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ file://0001-Fix-examples-build-error.patch \ " -SRCREV_ogl-runtime = "fe3ffda451732ebca0bdd7ecd19099f4cbfcfa75" +SRCREV_ogl-runtime = "b53aeb784f950d7b2a5ebe38ea37c5bb6f456c9c" SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5" SRCREV = "${SRCREV_ogl-runtime}" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 3690b3b0..36421c6e 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 = "c9d86b593e62c880d567a0672bd86283d8242f15" +SRCREV = "e04a70eb3b6e11a2eddc1ac912f3aecfb23ac6c0" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index e027b73d..8b87011c 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,7 +2,7 @@ # Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com> QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.12.10" +QT_MODULE_BRANCH ?= "5.12.12" 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.12.10+git${SRCPV}" +PV = "5.12.12+git${SRCPV}" diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 76816027..3afc3f28 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -1,4 +1,4 @@ -inherit native qmake5_base +inherit qmake5_base native # we don't want conflicts with qt4 OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb index 4e83c267..d9f88a81 100644 --- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb @@ -16,7 +16,7 @@ DEPENDS = "qtbase" # Needed with gcc-5.2 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65801 CXXFLAGS += "-Wno-narrowing" -SRC_URI = "git://github.com/nemomobile/qt5-plugin-generic-vboxtouch.git \ +SRC_URI = "git://github.com/nemomobile/qt5-plugin-generic-vboxtouch.git;branch=master;protocol=https \ file://0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch;patchdir=.. \ file://0001-include-errno.h-for-errno-definition.patch;patchdir=.. \ " diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 5ef19724..ca336844 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.9 +# 5.12.meta-qt5-shared.12 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -37,19 +37,20 @@ SRC_URI += "\ 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-Fix-Wdeprecated-copy-warnings.patch \ + file://0018-qfloat16-Include-limits-header.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.9 +# 5.12.meta-qt5-native.12 SRC_URI += " \ - file://0018-Always-build-uic-and-qvkgen.patch \ - file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0019-Always-build-uic-and-qvkgen.patch \ + file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ " # only for qtbase-native SRC_URI += " \ - file://0020-Bootstrap-without-linkat-feature.patch \ + file://0021-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" @@ -143,4 +144,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 = "c919fc5f65c1c509370df7e616263ed007931a7a" +SRCREV = "01272c0948be9f1c6b8a3eff328b931f47d38649" 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 85b6b63d..62607509 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 f474b08de99d505eb2f2b7d69fed40c4aa09ac70 Mon Sep 17 00:00:00 2001 +From 1ce378d41c2d26e9f24763f8eadda393e7765e4e 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 @@ -31,10 +31,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index ef7bad1bfc..dcca0f9135 100755 +index f9407ef587..467f57f960 100755 --- a/configure +++ b/configure -@@ -712,7 +712,7 @@ fi +@@ -709,7 +709,7 @@ fi # is where the resulting variable is written to setBootstrapVariable() { diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch index 999ec4c9..1b9e0794 100644 --- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch @@ -1,4 +1,4 @@ -From c1d85b492d8e40fe37dd11f69e24a04b3f086025 Mon Sep 17 00:00:00 2001 +From 0598d5f7a41993303557ff19920e5823c58b5f19 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 9c11e6de..f8116772 100644 --- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From 73e2aad711fe5d94f0aec72c353e5acf957d66d2 Mon Sep 17 00:00:00 2001 +From d0d2b716621b6e1dd874f3575e099f8f98241ffb Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the @@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index c0a5369cdd..df620d6ebe 100644 +index f2ada4ab30..62c6feae17 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -174,7 +174,10 @@ void QLibrarySettings::load() 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 60ae7314..f63edc8c 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 bf9825b206959b29be15e0b76db3ef59187e84cd Mon Sep 17 00:00:00 2001 +From 150679264704533a44f885ba4ae36c504914cec3 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 b109192..cccbf1c 100644 +index 33c90a8c2f..74da4682de 100644 --- a/configure.pri +++ b/configure.pri -@@ -836,10 +836,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -838,10 +838,10 @@ defineTest(qtConfOutput_preparePaths) { $${currentConfig}.output.qconfigSource = \ "/* Installation Info */" \ diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch index 8a236470..803f8776 100644 --- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch @@ -1,4 +1,4 @@ -From b6e5080c41557a20c85326af39323ff1ed42d944 Mon Sep 17 00:00:00 2001 +From 038242ebbaa2153a0ac7e81dffcac2b0b6eedc6c Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Mon, 24 Oct 2016 09:45:18 +0300 Subject: [PATCH] Disable all unknown features instead of erroring out @@ -10,7 +10,7 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index 242544d41b..68a7758a9c 100644 +index 850ee98057..7b591dc8bb 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1598,7 +1598,8 @@ defineReplace(qtConfEvaluateSingleExpression) { diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch index 7531b19a..f887b9bb 100644 --- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch @@ -1,4 +1,4 @@ -From ec636d121ae1dd6a0995cb9b9ac0321a1fab57e6 Mon Sep 17 00:00:00 2001 +From a86287d457e4eb7386d60f48fb5d0a1037b2ef25 Mon Sep 17 00:00:00 2001 From: Pascal Bach <pascal.bach@siemens.com> Date: Wed, 11 May 2016 15:20:41 +0200 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch index 98526ee4..95535a2f 100644 --- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch @@ -1,4 +1,4 @@ -From 2f4dcaf341e7b23cd23693f3675d70f5e1b18a24 Mon Sep 17 00:00:00 2001 +From e2dea00b1c713fd881d83c4b25d9e8e4e7d7d870 Mon Sep 17 00:00:00 2001 From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [PATCH] Delete qlonglong and qulonglong 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 955a772b..1f4df52a 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 054ca0a5394596156abbadc01cae46d0fb16e8ed Mon Sep 17 00:00:00 2001 +From 9fee68b32cdd86e4354a42aaa93c804bc7d30158 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,10 +36,10 @@ index e6fac74ccc..28c7e9cfb3 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 10b09629bc..858fc5fc99 100644 +index d477c2f112..c48cf04d8e 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -@@ -78,6 +78,7 @@ +@@ -80,6 +80,7 @@ #include <stdlib.h> #include <sys/stat.h> #include <unistd.h> @@ -47,7 +47,7 @@ index 10b09629bc..858fc5fc99 100644 #endif #include "private/qhostinfo_p.h" -@@ -2151,8 +2152,8 @@ public slots: +@@ -2153,8 +2154,8 @@ public slots: #if defined(Q_OS_MAC) pthread_yield_np(); diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index a92ff91f..b7f8c280 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -1,4 +1,4 @@ -From 64f3d24f53d5c0fc0af4cf36eaefb85d0c29f8c6 Mon Sep 17 00:00:00 2001 +From 2e135b2b154f6293da42685db266bfdd9b1e4a35 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch index 9aeb4b51..efe1c6eb 100644 --- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch +++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch @@ -1,4 +1,4 @@ -From a426a2623ef9566827093f0424944ef93318db64 Mon Sep 17 00:00:00 2001 +From 1ad62e76697d8dde8b31caf84ce0c5983278587d Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 09:44:48 -0700 Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index bf399e10..ae3dfaf5 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -1,4 +1,4 @@ -From cda33b76c273faa7d46667d8ebbdbecf12f55b30 Mon Sep 17 00:00:00 2001 +From 1d9f21489b64d3cd98d9304695a8bba3cd9d71d3 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 10:11:50 -0700 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc 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 index 9fb49d73..3b010068 100644 --- 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 @@ -1,4 +1,4 @@ -From 6047aa7010fb960fcc9dcc6714014e720e5179d1 Mon Sep 17 00:00:00 2001 +From b04f65cddd3fff0f2ca1223d28f508d382327673 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 diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch index dbe939ae..d47b13bc 100644 --- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch @@ -1,4 +1,4 @@ -From cee285b681dfeb25692ea6c756f8e0d8c5017a25 Mon Sep 17 00:00:00 2001 +From bc28dc25e719c182b0275dace8e13d3926e890e5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Tue, 23 Oct 2018 09:54:57 +0300 Subject: [PATCH] Disable ltcg for host_build diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index d33f06e3..3f239dec 100644 --- a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -1,4 +1,4 @@ -From ba7c32a7209edbe2f628e72308fd5cb5aa18238a Mon Sep 17 00:00:00 2001 +From 23c53b8cd1ccbdb382911c7a8e194ad06e333584 Mon Sep 17 00:00:00 2001 From: Max Krummenacher <max.krummenacher@toradex.com> Date: Sat, 27 Oct 2018 12:29:31 +0000 Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to diff --git a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch index c5a3c24b..4cae71fb 100644 --- a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch +++ b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch @@ -1,4 +1,4 @@ -From 1969e55b5e1b58b39c6712f8a2399ad1738b1673 Mon Sep 17 00:00:00 2001 +From f647a46e9572406a6d611cf6b6cb772e6723c08a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 6 Dec 2018 11:47:52 -0800 Subject: [PATCH] corelib: Include sys/types.h for uint32_t diff --git a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch index 3e173856..bd6a6719 100644 --- a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch +++ b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch @@ -1,4 +1,4 @@ -From c91442deb25e2d5d0d49898c308e2b71fe899a2a Mon Sep 17 00:00:00 2001 +From a0159813d1422e5f64c6b8ade4f4155ed886b406 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 6 Dec 2018 15:06:20 -0800 Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 9 insertions(+) diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf -index 03612e5689..f227e0772e 100644 +index 5003679bd0..2ab31b1603 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -41,6 +41,13 @@ defineReplace(qtVariablesFromGCC) { diff --git a/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch b/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch index 6d8a1629..29bbe89a 100644 --- a/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch +++ b/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch @@ -1,4 +1,4 @@ -From f434ca2641a9cb93b86ad0b74fbd9b16612a2c24 Mon Sep 17 00:00:00 2001 +From e042e3feaadcd37abcb449adaaee41e16e1dfae4 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen <allan.jensen@qt.io> Date: Tue, 13 Nov 2018 17:14:43 +0100 Subject: [PATCH] Fix -Wdeprecated-copy warnings @@ -27,10 +27,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 9 files changed, 44 insertions(+), 19 deletions(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index caecb68a84..3ef28dcb71 100644 +index 57edc8370a..689172adba 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf -@@ -99,14 +99,8 @@ clang { +@@ -100,14 +100,8 @@ clang { greaterThan(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS_WARN_ON += -Wshift-overflow=2 -Wduplicated-cond # GCC 7 has a lot of false positives relating to this, so disable completely greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-stringop-overflow @@ -46,7 +46,7 @@ index caecb68a84..3ef28dcb71 100644 } warnings_are_errors:warning_clean { -@@ -146,14 +140,13 @@ warnings_are_errors:warning_clean { +@@ -147,14 +141,13 @@ warnings_are_errors:warning_clean { # GCC 7 includes -Wimplicit-fallthrough in -Wextra, but Qt is not yet free of implicit fallthroughs. greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=implicit-fallthrough diff --git a/recipes-qt/qt5/qtbase/0018-qfloat16-Include-limits-header.patch b/recipes-qt/qt5/qtbase/0018-qfloat16-Include-limits-header.patch new file mode 100644 index 00000000..5884fafd --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-qfloat16-Include-limits-header.patch @@ -0,0 +1,58 @@ +From 0d72160c2956cc18246b198b8a752f2af146a062 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Mar 2021 13:18:47 -0800 +Subject: [PATCH] qfloat16: Include <limits> header + +gcc11 complains + error: 'numeric_limits' is not a class template + | 344 | template<> class numeric_limits<const QT_PREPEND_NAMESPACE(qfloat16)> + +This is because its missing right header which perhaps is included +implicitly in older compilers + +Change-Id: I29fa715399e4aa4686d01a2385fcde4ac6860cc0 +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/corelib/global/qfloat16.h | 1 + + src/corelib/tools/qbytearraymatcher.h | 1 + + src/tools/moc/generator.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h +index b76d2b9616..66383722e6 100644 +--- a/src/corelib/global/qfloat16.h ++++ b/src/corelib/global/qfloat16.h +@@ -43,6 +43,7 @@ + #include <QtCore/qglobal.h> + #include <QtCore/qmetatype.h> + #include <string.h> ++#include <limits> + + #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) + // All processors that support AVX2 do support F16C too. That doesn't mean +diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h +index dafaea9c12..fd9038dcc6 100644 +--- a/src/corelib/tools/qbytearraymatcher.h ++++ b/src/corelib/tools/qbytearraymatcher.h +@@ -40,6 +40,7 @@ + #ifndef QBYTEARRAYMATCHER_H + #define QBYTEARRAYMATCHER_H + ++#include <limits> + #include <QtCore/qbytearray.h> + + QT_BEGIN_NAMESPACE +diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp +index 12ffd6ae95..a6683d303c 100644 +--- a/src/tools/moc/generator.cpp ++++ b/src/tools/moc/generator.cpp +@@ -40,6 +40,7 @@ + #include <QtCore/qplugin.h> + #include <QtCore/qstringview.h> + ++#include <limits> + #include <math.h> + #include <stdio.h> + diff --git a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch index 668f5764..48466883 100644 --- a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 65964cf34bb703359ad42fee3b56aa768582bbdc Mon Sep 17 00:00:00 2001 +From 0eb870c467ecb1f756f665e65798deb21dd360f0 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index b704ccd7ab..422865874f 100644 +index 1c76a2e46f..fbd4014fb3 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -236,7 +236,7 @@ qtConfig(gui) { +@@ -232,7 +232,7 @@ qtConfig(gui) { } } } diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch index 32311591..4daa3bee 100644 --- a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch @@ -1,4 +1,4 @@ -From e98e9c57e8c614ae14e1f3a423c508a59025fd49 Mon Sep 17 00:00:00 2001 +From e45d6335b5030195cffb54a49632e0123477cf42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Sun, 14 Apr 2019 13:27:58 +0200 Subject: [PATCH] Avoid renameeat2 for native(sdk) builds diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch index bef94fc1..493d867f 100644 --- a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 620ce7709bfdc46fb7a5b256c6b14d01563e8314 Mon Sep 17 00:00:00 2001 +From 51756824d0aad6965aeec06581b0181e28a6b402 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index fb6449f3..78665274 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.9 +# 5.12.meta-qt5-shared.12 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -33,11 +33,14 @@ SRC_URI += "\ 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-Fix-Wdeprecated-copy-warnings.patch \ + file://0018-qfloat16-Include-limits-header.patch \ " # for syncqt RDEPENDS_${PN}-tools += "perl" +inherit pkgconfig + # separate some parts of PACKAGECONFIG which are often changed PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', 'no-opengl', d)}" PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" @@ -295,4 +298,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "c919fc5f65c1c509370df7e616263ed007931a7a" +SRCREV = "01272c0948be9f1c6b8a3eff328b931f47d38649" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index a68de877..0612cd4d 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "b977d8c14cda8159dfd669e0bd42b263e936a12d" +SRCREV = "b7080e5e66f2c799251bc637fd7dcaca7dda24cf" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 50b7e1de..31936401 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 = "754f8d15a01bae966c43749e3cc833d2def7e808" +SRCREV = "acecb7321c22267d9372d2e23a452592cb5e45e9" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 52404095..78152bd7 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 = "568c411f2751a97e9cc39f58adfa16f2465c4bae" +SRCREV = "6141231525a64232bfb00960a6d4ad181d5bef2f" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 3bbc3314..90161975 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 = "dae7527bee9f86bc0e6254068aeeb908df5a6de5" +SRCREV = "7cf388560ac989d19294aed6f6fbca74b761ac7d" diff --git a/recipes-qt/qt5/qtdeclarative/0001-Fix-build-with-gcc-11.patch b/recipes-qt/qt5/qtdeclarative/0001-Fix-build-with-gcc-11.patch new file mode 100644 index 00000000..0eb78467 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-Fix-build-with-gcc-11.patch @@ -0,0 +1,69 @@ +From aca2df64cd0cb6c4a8c03dc564c59f2a805dda7c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 4 Mar 2021 14:37:06 -0800 +Subject: [PATCH] Fix build with gcc-11 + +* squash 2 patches from meta-qt5/master: +qmldebug: Include limits header + +this is needed to solve +qmldebug/qqmlprofilerevent_p.h:314:65: error: 'numeric_limits' is not a member of 'std' + +Its exposed bu gcc11 + +yarr: Include <limits> for numeric_limits + +Fixes +src/3rdparty/masm/yarr/Yarr.h:46:44: error: 'numeric_limits' is not a member of 'std' + 46 | static const unsigned offsetNoMatch = std::numeric_limits<unsigned>::max(); + | ^~~~~~~~~~~~~~ + +Upstream-Status: Pending + +And add <limits> also to src/qml/jsruntime/qv4propertykey_p.h. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/3rdparty/masm/yarr/Yarr.h | 2 +- + src/qml/jsruntime/qv4propertykey_p.h | 1 + + src/qmldebug/qqmlprofilerevent_p.h | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h +index ccf78f9880..cbb42c60d8 100644 +--- a/src/3rdparty/masm/yarr/Yarr.h ++++ b/src/3rdparty/masm/yarr/Yarr.h +@@ -27,7 +27,7 @@ + + #pragma once + +-#include <limits.h> ++#include <limits> + #include "YarrErrorCode.h" + + namespace JSC { namespace Yarr { +diff --git a/src/qml/jsruntime/qv4propertykey_p.h b/src/qml/jsruntime/qv4propertykey_p.h +index 47867765db..c945b27498 100644 +--- a/src/qml/jsruntime/qv4propertykey_p.h ++++ b/src/qml/jsruntime/qv4propertykey_p.h +@@ -50,6 +50,7 @@ + // We mean it. + // + ++#include <limits> + #include <private/qv4global_p.h> + + QT_BEGIN_NAMESPACE +diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h +index 1e205d8dbb..f2467bb032 100644 +--- a/src/qmldebug/qqmlprofilerevent_p.h ++++ b/src/qmldebug/qqmlprofilerevent_p.h +@@ -47,6 +47,7 @@ + #include <QtCore/qvarlengtharray.h> + #include <QtCore/qmetatype.h> + ++#include <limits> + #include <initializer_list> + #include <type_traits> + diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch new file mode 100644 index 00000000..e1067016 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch @@ -0,0 +1,60 @@ +From dc94032e6132b41bd6927357e4a57c31436294eb 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 5b94da9b6..0e3496ce8 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 0e63ac2ce..7a30ab64e 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 +@@ -113,7 +113,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 19551e3ba..bf3f79a45 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. +-- +2.24.0 + diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index d27450b8..2d22e0f2 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,10 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "36e4e9bbd402cefab9d7b68635a94a02e0b41187" +SRCREV = "824570979e211171f158e7fcab15c599c5e7ca4e" BBCLASSEXTEND =+ "native nativesdk" + +SRC_URI += "file://0001-Fix-build-with-gcc-11.patch \ + file://0001-Use-python3-explicitly.patch \ +" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 40e39cec..d29533f3 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -1,6 +1,8 @@ require qt5.inc require qt5-git.inc +inherit pkgconfig + LICENSE = "GPL-3.0 | LGPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ @@ -14,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "93b710ebc59a5fac6f9f657c5afe8770bf7506ab" +SRCREV = "7977b4ddad8fdd847424d3b517c288bacc21a021" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 08762bc0..bddc5e11 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 = "fabaae2f8039d9f12e8531e2dc215b24ffe8d445" +SRCREV = "266b575c61ce4e3689d48663a93ef235006613eb" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 84f1cd1e..8321408e 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 = "7518d381be0f58f943bd8bead901356d2528e26b" +SRCREV = "97151e285f51a54bf0025b1ca986bf3d07cc4854" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index fcdbce65..21e1a7ae 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 = "1e3510bf14942bd1b1134a52700e0ca06cbbf5d8" +SRCREV = "6797fc9a75cf308bd39e557c8474c30fb71582c2" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 163202ee..0e1ba9c9 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -36,7 +36,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 = "3c7489c3802a11bf62b7f851fb088f9671b76262" +SRCREV_qtlocation = "1731750f2907c3498a06c02f9f271b392a9501fb" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 2d1931dd..5cfebe22 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 = "91d59b6e103cb5b910d310cb32938a7e9235dddb" +SRCREV = "10b4ea4c141567c33c6646b36e0207f90535b5a0" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index a6116bae..74203a08 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" +inherit pkgconfig + PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" @@ -37,4 +39,4 @@ 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 = "67ab370d6a87d3b44e1cc4efb0f3fc57d5ac751e" +SRCREV = "6a7742432e2c1541f65cfcf8a4137dd42f783d3a" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index c487c88f..3e1678d5 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 = "2bcf17c3e4131b0b5b15c96ed104fceede3c3990" +SRCREV = "7739b4b995977445695457c57bbd7008f2d39e67" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 55bcbdab..44ddcfda 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "a718a44c796b8805fc208035cd743de1efd7e7d4" +SRCREV = "c514ea1d1806886664dc46626de7679038564110" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 93c5ce49..469fc6b0 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 = "f3cbd4531566f6c0d0b14ba179b8396bf4270083" +SRCREV = "6d3d2b2b659caa8dd158a1aedd796bed9b2e3a2d" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 55907713..4d454ad7 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 = "63f73a2aee40f9bec5ef63fdd416877a6737110d" +SRCREV = "898091385d34427ec2032bcee15b5ceb4d10286e" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 70e7d820..d72bb831 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 = "8c37f9ee025057ab27f9a8c92e8d3e2b585ebf6c" +SRCREV = "3fa3824bdf1eacf00e96fc2f34ce5709acc56663" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 3d1fcfc4..8c3c89f3 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "bfd4ed0f9a6edf9217dcea99e2f045f532453783" +SRCREV = "e984c11fd225bbe807762e105a2b6c701eeb3917" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 5b68392b..b2f149a6 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 = "2ec32b5fdb9671f44e506964ae03109e557dfb99" +SRCREV = "337059fe1ce7d3236a6a7cec1c3622fe3e911921" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index f9793f38..feb4eeea 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 = "878112bf670bb9f9caa09de290c63b0f9078d3f0" +SRCREV = "a5482507a444dc06774fb0365eddd73e5dac114c" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 42fcf55f..d5345a48 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 = "903ed99bcc92417cd76d79ac598daf5f299b80cd" +SRCREV = "6af0f5497c5c550c449036ddbd7a4684faadde8f" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index c14eefcc..fdc53751 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 = "dbddf24b08141ffd2f1ed98fbcf64b1220161e05" +SRCREV = "29d038921e929ad4d6a56857de7fef368f4cd7fc" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 6fabdc5a..019e505e 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 = "9431549e2e3c75dafa38a6bd7d45cbaa091a632f" +SRCREV = "dbc00fa42ac4779cf2846640c3117c351de04aa5" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index e3dbca43..e71ddce6 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 = "261ed79b966065f4ce398f1a701be6298dd49be9" +SRCREV = "85485845bdf502674edf4d5b840f0194e62da7bb" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index f98d13ba..f7bc22ec 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "1d665e7f4ac2a426e702c2935f11aa160e27bddb" +SRCREV = "9ff3504a4387f87a38e3207fe9c3c5d2a9428d5b" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 93e87c99..0dd043c8 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native" do_install_append() { # remove qtquick1 translations - qtquick1 is gone - for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do + for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do rm $transfile done } @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "e281294aeb5e74e93fb2f71233b133a4177593d6" +SRCREV = "62e14d18353f19b5747275a08f808e962f1f0b57" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 883952f9..b70f7814 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 = "bb9fd3b992d716ebba392bc3cf21da41e5562d08" +SRCREV = "e5f70404fd6f9aa64dd6dd2435d6340d46821b47" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a0cda175..b3d5a6cc 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -1,6 +1,8 @@ require qt5.inc require qt5-git.inc +inherit pkgconfig + DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native" DEPENDS_append_class-target = " libxkbcommon" @@ -37,7 +39,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "971ed94adbf538af5a09e4136921fc0e8cee9815" +SRCREV = "190646bcf0ae20174f32a240a81c9830dedd3c9b" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index dca858cb..fbb309b5 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 = "7219a32c30d21bc6cc8fe2121e28d19da3d67b00" +SRCREV = "4d43a2fbdb4c43d9ae232dc5d646514fca525e3a" diff --git a/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch b/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch new file mode 100644 index 00000000..89014da3 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch @@ -0,0 +1,39 @@ +From 5f5afe275757efe77ff48debb040e08001ea5907 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 8 Mar 2020 10:51:48 +0100 +Subject: [PATCH] Remove ninja version test for now - it fails for ninja >= + 1.10.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As long as upstream has no better solution, assume we have a ninja version +recent enough + +Fixes: +| Found ninja from path: /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/qtwebengine/5.14.1+gitAUTOINC+73d457481c_a9a20127e8-r0/recipe-sysroot-native/usr/bin/ninja +| + /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/qtwebengine/5.14.1+gitAUTOINC+73d457481c_a9a20127e8-r0/recipe-sysroot-native/usr/bin/ninja --version +| > 1.10.0 +| Ninja version too old + +Upstream-Status: Inappropriate [temporary-hack] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + configure.pri | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.pri b/configure.pri +index 3a144e3f..6c3f29fd 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -163,8 +163,7 @@ defineTest(qtConfTest_detectNinja) { + !isEmpty(ninja) { + qtLog("Found ninja from path: $$ninja") + qtRunLoggedCommand("$$ninja --version", version)|return(false) +- contains(version, "1.[7-9].*"): return(true) +- qtLog("Ninja version too old") ++ return(true) + } + qtLog("Building own ninja") + return(false) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 00000000..8e3b844d --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,72 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 148bbdbd..5dad2316 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -30,6 +30,8 @@ DEPENDS += " \ DEPENDS_append_libc-musl = " libexecinfo" +inherit pkgconfig + EXTRA_QMAKEVARS_CONFIGURE += "-feature-webengine-system-ninja -no-feature-webengine-system-gn" EXTRA_QMAKEVARS_PRE += "CONFIG+=force_debug_info" @@ -139,6 +141,7 @@ QT_MODULE_BRANCH_CHROMIUM = "69-based" SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ + file://0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch \ " SRC_URI_append_libc-musl = "\ file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ @@ -157,6 +160,7 @@ SRC_URI += " \ file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ + file://chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch;patchdir=src/3rdparty \ " SRC_URI_append_libc-musl = "\ @@ -176,8 +180,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "07fcac049e7b362b703f31ec559f5097f804588e" -SRCREV_chromium = "92253f4cc04b8fddd238e2fc9309d8c33c8bdc05" +SRCREV_qtwebengine = "56e97848125329780566db8164c9753872e65f0f" +SRCREV_chromium = "78831e7aca3f82a0c64499706c8017c13389efa3" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 89ba2d3a..7e496187 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 = "954a898bea7af04cb619c05637a651e3a0d925f3" +SRCREV = "1c9f1fef2cc13d63086fdeaa536d4e5465c126d2" diff --git a/recipes-qt/qt5/qtwebkit/0001-Fix-build-with-icu-65.1-https-bugs.webkit.org-show_b.patch b/recipes-qt/qt5/qtwebkit/0001-Fix-build-with-icu-65.1-https-bugs.webkit.org-show_b.patch new file mode 100644 index 00000000..e987eef0 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0001-Fix-build-with-icu-65.1-https-bugs.webkit.org-show_b.patch @@ -0,0 +1,53 @@ +From 94e71ee824df7b3dc126ff96007daaca56829924 Mon Sep 17 00:00:00 2001 +From: "commit-queue@webkit.org" <commit-queue@webkit.org> +Date: Fri, 4 Oct 2019 21:51:37 +0000 +Subject: [PATCH] Fix build with icu 65.1 + https://bugs.webkit.org/show_bug.cgi?id=202600 + +Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04 +Reviewed by Konstantin Tokarev. + +Source/WebCore: + +* dom/Document.cpp: +(WebCore::isValidNameNonASCII): +(WebCore::Document::parseQualifiedName): + +Source/WTF: + +* wtf/URLHelpers.cpp: +(WTF::URLHelpers::allCharactersInIDNScriptWhiteList): + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WebCore/dom/Document.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp +index 2598b0f1e..28a935b55 100644 +--- a/Source/WebCore/dom/Document.cpp ++++ b/Source/WebCore/dom/Document.cpp +@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S + + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(qualifiedName, i, length, c) ++ U16_NEXT(qualifiedName, i, length, c); + if (c == ':') { + if (sawColon) { + ec = NAMESPACE_ERR; diff --git a/recipes-qt/qt5/qtwebkit/0006-Fix-build-with-bison37.patch b/recipes-qt/qt5/qtwebkit/0006-Fix-build-with-bison37.patch new file mode 100644 index 00000000..9262f5fe --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0006-Fix-build-with-bison37.patch @@ -0,0 +1,52 @@ +From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev <mitya57@gmail.com> +Date: Tue, 4 Aug 2020 21:04:06 +0300 +Subject: [PATCH] Let Bison generate the header directly, to fix build with + Bison 3.7 + +Starting with Bison 3.7, the generated C++ file #include's the header +by default, instead of duplicating it. So we should not delete it. + +Remove the code to add #ifdef guards to the header, since Bison adds +them itself since version 2.6.3. + +Found at [1] + +[1] https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31 + +Upstream-Status: Pending +--- + Source/WebCore/css/makegrammar.pl | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) + +diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl +index 5d63b08102eb..9435701c7061 100644 +--- a/Source/WebCore/css/makegrammar.pl ++++ b/Source/WebCore/css/makegrammar.pl +@@ -73,25 +73,6 @@ + } + + my $fileBase = File::Spec->join($outputDir, $filename); +-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); + push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. + system(@bisonCommand) == 0 or die; +- +-open HEADER, ">$fileBase.h" or die; +-print HEADER << "EOF"; +-#ifndef CSSGRAMMAR_H +-#define CSSGRAMMAR_H +-EOF +- +-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; +-while (<HPP>) { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- diff --git a/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch b/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch new file mode 100644 index 00000000..1715c8f3 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch @@ -0,0 +1,125 @@ +From 0e94085f74b562bf8edf5418142323785a069454 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Wed, 2 Dec 2020 22:34:54 +0100 +Subject: [PATCH] Fix build with icu >= 68 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Source/WebCore/platform/text/TextCodecICU.cpp | 15 +++++++++++++++ + Source/WebCore/platform/text/icu/UTextProvider.h | 15 +++++++++++++++ + .../platform/text/icu/UTextProviderLatin1.cpp | 15 +++++++++++++++ + .../platform/text/icu/UTextProviderUTF16.cpp | 15 +++++++++++++++ + 4 files changed, 60 insertions(+) + +diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp +index dd6ff0675..7ce8a70ef 100644 +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -39,6 +39,21 @@ + #include <wtf/text/StringBuilder.h> + #include <wtf/unicode/CharacterNames.h> + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ ++#ifndef FALSE ++# define FALSE false ++#endif ++ + namespace WebCore { + + const size_t ConversionBufferSize = 16384; +diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h +index c254fc4c7..9d2ad8b8c 100644 +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -28,6 +28,21 @@ + + #include <unicode/utext.h> + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ ++#ifndef FALSE ++# define FALSE false ++#endif ++ + namespace WebCore { + + enum class UTextProviderContext { +diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +index cd6852c71..0c95ea529 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -29,6 +29,21 @@ + #include "UTextProvider.h" + #include <wtf/text/StringImpl.h> + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ ++#ifndef FALSE ++# define FALSE false ++#endif ++ + namespace WebCore { + + // Latin1 provider +diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +index 7aaac48c8..6ac693602 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -28,6 +28,21 @@ + + #include "UTextProvider.h" + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ ++#ifndef FALSE ++# define FALSE false ++#endif ++ + namespace WebCore { + + // UTF16ContextAware provider +-- +2.26.2 + diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index c5473440..f3f76878 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,6 +1,8 @@ require qt5.inc require qt5-git.inc +inherit pkgconfig + LICENSE = "BSD & LGPLv2+ | GPL-2.0" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ @@ -16,6 +18,9 @@ SRC_URI += "\ file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \ file://0004-Fix-build-bug-for-armv32-BE.patch \ file://0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ + file://0008-Fix-build-with-icu-68.patch \ + file://0001-Fix-build-with-icu-65.1-https-bugs.webkit.org-show_b.patch \ + file://0006-Fix-build-with-bison37.patch \ " inherit cmake_qt5 perlnative pythonnative diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index e4549c56..99c79008 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 = "4156135c236ae2799f40fae1741c038d1f150934" +SRCREV = "78c04c8d106339ae78259ccf2c5e03e7a8bce087" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 1a3f29ab..9d8d7798 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "14a616da97106ce08fae58329c211c4688c7fbdf" +SRCREV = "a62f0e2ddf4c884a0d535df91edb4dfe21e8dfca" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 9b04d368..fbd3529c 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 = "be7f01d16d143681be394a13e19eb4d816aa8a97" +SRCREV = "d1f806ed5eed226b35e94f91381e2533cdd6a5ff" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 34d01abc..8df281da 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "2e532e96db74bc666af800c2530827eea75a2107" +SRCREV = "6d445812a9c584c8483511023acb25e17f20ca25" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qtchooser/qtchooser_git.bb b/recipes-qt/qtchooser/qtchooser_git.bb index 3dcb35d0..ba92e4df 100644 --- a/recipes-qt/qtchooser/qtchooser_git.bb +++ b/recipes-qt/qtchooser/qtchooser_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Wrapper to select between Qt development binary versions" HOMEPAGE = "http://macieira.org/qtchooser" LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0" -SRC_URI = "git://code.qt.io/qtsdk/qtchooser.git" +SRC_URI = "git://code.qt.io/qtsdk/qtchooser.git;branch=master" LIC_FILES_CHKSUM = " \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ diff --git a/recipes-qt/tufao/tufao_1.3.10.bb b/recipes-qt/tufao/tufao_1.3.10.bb index 719269f1..07bae459 100644 --- a/recipes-qt/tufao/tufao_1.3.10.bb +++ b/recipes-qt/tufao/tufao_1.3.10.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "qtbase" SRCREV = "ad505c32d0ba14c3c616de8ba4c7eb79396c20a6" -SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http;branch=1.x \ +SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http;branch=1.x;protocol=https \ file://build-Fix-mkspecs-and-CMake-module-install-directori.patch \ file://0001-CMakeLists.txt-fix-build-with-Qt-5.11-don-t-use-qt5_.patch \ " |