diff options
56 files changed, 1170 insertions, 820 deletions
diff --git a/licenses/The-Qt-Company-Commercial b/licenses/The-Qt-Company-Commercial index 74bd6bb4..7be8fb5d 100644 --- a/licenses/The-Qt-Company-Commercial +++ b/licenses/The-Qt-Company-Commercial | |||
@@ -1,863 +1,865 @@ | |||
1 | QT LICENSE AGREEMENT | 1 | QT LICENSE AGREEMENT Agreement version 4.2 |
2 | Agreement version 4.0 | ||
3 | 2 | ||
4 | This License Agreement ("Agreement") is a legal agreement between The Qt | 3 | This Qt License Agreement (“Agreement”) is a legal agreement for the licensing |
5 | Company (as defined below) and the Licensee (as defined below) for the license | 4 | of Licensed Software (as defined below) between The Qt Company (as defined |
6 | of Licensed Software (as defined below). Capitalized terms used herein are | 5 | below) and the Licensee who has accepted the terms of this Agreement by |
7 | defined in Section 1. | 6 | downloading or using the Licensed Software and/or as defined herein: |
8 | 7 | ||
9 | WHEREAS: | 8 | Capitalized terms used herein are defined in Section 1. |
10 | |||
11 | (A). Licensee wishes to use the Licensed Software for the purpose of developing | ||
12 | and distributing Applications and/or Devices; and | ||
13 | 9 | ||
14 | (B). The Qt Company is willing to grant the Licensee a right to use Licensed | 10 | WHEREAS: |
15 | Software for such purpose pursuant to term and conditions of this Agreement. | 11 | (A) Licensee wishes to use the Licensed Software for the purpose of |
12 | developing and distributing Applications and/or Devices (each as | ||
13 | defined below); and | ||
14 | (B) The Qt Company is willing to grant the Licensee a right to use | ||
15 | Licensed Software for such a purpose pursuant to term and conditions | ||
16 | of this Agreement. | ||
16 | 17 | ||
17 | NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: | 18 | NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: |
18 | 19 | ||
20 | |||
19 | 1. DEFINITIONS | 21 | 1. DEFINITIONS |
20 | 22 | ||
21 | "Affiliate" of a Party shall mean an entity (i) which is directly or indirectly | 23 | “Affiliate” of a Party shall mean an entity (i) which is directly |
22 | controlling such Party; (ii) which is under the same direct or indirect | 24 | or indirectly controlling such Party; (ii) which is under the same direct or |
23 | ownership or control as such Party; or (iii) which is directly or indirectly | 25 | indirect ownership or control as such Party; or (iii) which is directly or |
24 | owned or controlled by such Party. For these purposes, an entity shall be | 26 | indirectly owned or controlled by such Party. For these purposes, an entity |
25 | treated as being controlled by another if that other entity has fifty percent | 27 | shall be treated as being controlled by another if that other entity has fifty |
26 | (50 %) or more of the votes in such entity, is able to direct its affairs | 28 | percent (50 %) or more of the votes in such entity, is able to direct its |
27 | and/or to control the composition of its board of directors or equivalent body. | 29 | affairs and/or to control the composition of its board of directors or |
30 | equivalent body. | ||
31 | |||
32 | “Add-on Products” shall mean The Qt Company’s specific add-on software products | ||
33 | (for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which | ||
34 | are not licensed as part of The Qt Company’s standard offering, but shall be | ||
35 | included into the scope of Licensed Software only if so specifically agreed | ||
36 | between the Parties. | ||
28 | 37 | ||
29 | "Applications" shall mean Licensee's software products created using the | 38 | “Applications” shall mean Licensee's software products created using the |
30 | Licensed Software, which may include the Redistributables, or part | 39 | Licensed Software, which may include the Redistributables, or part thereof. |
31 | thereof. | ||
32 | 40 | ||
33 | "Contractor(s)" shall mean third party consultants, distributors and | 41 | “Contractor(s)” shall mean third party consultants, distributors and contractors |
34 | contractors performing services to a Party under applicable contractual | 42 | performing services to the Licensee under applicable contractual arrangement. |
35 | arrangement. | ||
36 | 43 | ||
37 | "Customer(s)" shall mean Licensee's end users to whom Licensee, directly or | 44 | “Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or |
38 | indirectly, distributes copies of the Redistributables. | 45 | indirectly, distributes copies of the Redistributables. |
39 | 46 | ||
40 | "Deployment Platforms" shall mean operating systems specified in the License | 47 | “Data Protection Legislation” shall mean the General Data Protection Regulation |
41 | Certificate, in which the Redistributables can be distributed pursuant to the | 48 | (EU 2016/679) (GDPR) and any national implementing laws, regulations and |
49 | secondary legislation, as may be amended or updated from time to time, as well | ||
50 | as any other data protection laws or regulations applicable in relevant | ||
51 | territory. | ||
52 | |||
53 | “Deployment Platforms” shall mean operating systems specified in the License | ||
54 | Certificate, on which the Redistributables can be distributed pursuant to the | ||
42 | terms and conditions of this Agreement. | 55 | terms and conditions of this Agreement. |
43 | 56 | ||
44 | "Designated User(s)" shall mean the employee(s) of Licensee or Licensee's | 57 | “Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s |
45 | Affiliates acting within the scope of their employment or Licensee's | 58 | Affiliates acting within the scope of their employment or Licensee's Contractors |
46 | Contractors acting within the scope of their services for Licensee and on | 59 | acting within the scope of their services for Licensee and on behalf of |
47 | behalf of Licensee. Designated Users shall be named in the License Certificate. | 60 | Licensee. Designated Users shall be named in the License Certificate. |
48 | 61 | ||
49 | "Development License" shall mean the license needed by the Licensee for each | 62 | “Development License” shall mean the license needed by the Licensee for each |
50 | Designated User to use the Licensed Software under the license grant described | 63 | Designated User to use the Licensed Software under the license grant described |
51 | in Section 3.1 of this Agreement. | 64 | in Section 3.1 of this Agreement. Development Licenses are available separately |
65 | for Qt for Application Development and Qt for Device Creation products, each | ||
66 | product having its designated scope and purpose of use. Distribution Licenses | ||
67 | are always connected to Qt for Device Creation product only. | ||
52 | 68 | ||
53 | "Development Platforms" shall mean those operating systems specified in the | 69 | “Development Platforms” shall mean those operating systems specified in the |
54 | License Certificate, in which the Licensed Software can be used under the | 70 | License Certificate, in which the Licensed Software can be used under the |
55 | Development License, but not distributed in any form or used for any other | 71 | Development License, but not distributed in any form or used for any other |
56 | purpose. | 72 | purpose. |
57 | 73 | ||
58 | "Devices" shall mean hardware devices or products that 1) are manufactured | 74 | “Devices” shall mean hardware devices or products that 1) are manufactured |
59 | and/or distributed by the Licensee or its Affiliates or Contractors, and | 75 | and/or distributed by the Licensee or its Affiliates or Contractors, and (2)(i) |
60 | (2)(i) incorporate or integrate the Redistributables or parts thereof; or (ii) | 76 | incorporate or integrate the Redistributables or parts thereof; or (ii) where |
61 | do not incorporate or integrate the Redistributables at the time of | 77 | the main user interface or substantial functionality of such unit , when used by |
62 | distribution, but where, when used by a Customer, the main user interface or | 78 | a Customer, is provided by Application(s) or otherwise depends on the Licensed |
63 | substantial functionality of such device is provided by Application(s) or | 79 | Software, regardless of whether the Redistributables are distributed together |
64 | otherwise depends on the Licensed Software. | 80 | with the hardware or not. Devices covered with this Agreement shall be specified |
65 | 81 | in Appendix 2 or in a quote. | |
66 | "Distribution License(s)" shall mean the license required for distribution of | 82 | |
67 | Redistributables in connection with Devices pursuant to license grant described | 83 | “Distribution License(s)” shall mean the license required for any kind of sale, |
68 | in Section 3.3 of this Agreement. | 84 | trade, exchange, loan, lease, rental or other distribution by or on behalf of |
69 | 85 | Licensee to a third party of Redistributables in connection with Devices | |
70 | "Distribution License Packs" shall mean set of prepaid Distribution Licenses | 86 | pursuant to license grant described in Section 3.3 of this Agreement. |
71 | for distribution of Redistributables, as defined in The Qt Company's standard | 87 | |
72 | price list, quote, Purchase Order confirmation or in an appendix hereto, | 88 | “Distribution License Packs” shall mean set of prepaid Distribution Licenses for |
73 | as the case may be. | 89 | distribution of Redistributables, as defined in The Qt Company’s standard price |
74 | 90 | list, quote, Purchase Order confirmation or in an appendix hereto, as the case | |
75 | "Intellectual Property Rights" shall mean patents (including utility models), | 91 | may be. |
92 | |||
93 | “Intellectual Property Rights” shall mean patents (including utility models), | ||
76 | design patents, and designs (whether or not capable of registration), chip | 94 | design patents, and designs (whether or not capable of registration), chip |
77 | topography rights and other like protection, copyrights, trademarks, service | 95 | topography rights and other like protection, copyrights, trademarks, service |
78 | marks, trade names, logos or other words or symbols and any other form of | 96 | marks, trade names, logos or other words or symbols and any other form of |
79 | statutory protection of any kind and applications for any of the foregoing as | 97 | statutory protection of any kind and applications for any of the foregoing as |
80 | well as any trade secrets. | 98 | well as any trade secrets. |
81 | 99 | ||
82 | "License Certificate" shall mean a certificate generated by The Qt Company for | 100 | “License Certificate” shall mean a certificate generated by The Qt Company for |
83 | each Designated User respectively upon them downloading the licensed Software. | 101 | each Designated User respectively upon them downloading the Licensed Software, |
84 | License Certificate will be available under respective Designated User's Qt | 102 | which will be available under respective Designated User’s Qt Account at |
85 | Account at account.qt.io and it will specify the Designated User, the | 103 | account.qt.io. License Certificates will specify the Designated User, the |
86 | Development Platforms, Deployment Platforms and the License Term. The terms of | 104 | Development Platforms, Deployment Platforms and the License Term. Such terms are |
87 | the License Certificate are considered part of this Agreement and shall be | 105 | considered part of the licenses granted hereunder and shall be updated from time |
88 | updated from time to time to reflect any agreed changes to the foregoing terms | 106 | to time to reflect any agreed changes to the foregoing terms relating to |
89 | relating to Designated User's rights to the Licensed Software. | 107 | Designated User’s rights to the Licensed Software. |
90 | 108 | ||
91 | "License Fee" shall mean the fee charged to the Licensee for rights granted | 109 | “License Fee” shall mean the fee charged to the Licensee for rights granted |
92 | under the terms of this Agreement. | 110 | under the terms of this Agreement. |
93 | 111 | ||
94 | "License Term" shall mean the agreed validity period of the Development | 112 | “License Term” shall mean the agreed validity period of the Development License |
95 | License of the respective Designated User, during which time the | 113 | of the respective Designated User, during which time the Designated User is |
96 | Designated User is entitled to use the Licensed Software, as set forth in the | 114 | entitled to use the Licensed Software, as set forth in the respective License |
97 | respective License Certificate. | 115 | Certificate. |
98 | |||
99 | "Licensed Software" shall mean all versions of the | ||
100 | |||
101 | (i) Qt Toolkit (including Qt Essentials, Qt Add-Ons and Value-Add modules) as | ||
102 | described in http://doc.qt.io/qt-5/qtmodules.html, | ||
103 | |||
104 | (ii) Qt Creator (including Creator IDE tool) as described in | ||
105 | http://doc.qt.io/qtcreator/index.html, | ||
106 | 116 | ||
107 | (iii) Qt 3D Studio as described in http://doc.qt.io/qt3dstudio/index.html, and | 117 | “Licensed Software” shall mean either |
118 | (i) Qt for Application Development or | ||
119 | (ii) Qt for Device Creation, and/or | ||
120 | (iii) Qt 3D Studio, and/or | ||
121 | (iv) Qt Design Studio, and/or | ||
122 | (v) selected Add-on Products, if any, | ||
108 | 123 | ||
124 | depending on which product(s) the Licensee has purchased under this Agreement, | ||
109 | as well as corresponding online or electronic documentation, associated media | 125 | as well as corresponding online or electronic documentation, associated media |
110 | and printed materials, including the source code, example programs and the | 126 | and printed materials, including the source code, example programs and the |
111 | documentation, licensed to the Licensee under this Agreement. Licensed Software | 127 | documentation, licensed to the Licensee under this Agreement. Licensed Software |
112 | does not include Third Party Software (as defined in Section 4), Open Source | 128 | does not include Third Party Software (as defined in Section 4) or Open Source |
113 | Qt, or other software products of The Qt Company (for example Qt Safe Renderer | 129 | Qt. The Qt Company may, in the course of its development activities, at its free |
114 | and Qt for Automation), unless such other software products of The Qt Company | 130 | and absolute discretion and without any obligation to send or publish any |
115 | are separately agreed in writing to be included in scope of the Licensed | 131 | notifications to the Licensee or in general, make changes, additions or |
116 | Software. | 132 | deletions in the components and functionalities of the Licensed Software, |
117 | 133 | provided that no such changes, additions or deletions will affect the already | |
118 | "Licensee" shall mean the individual or legal entity that is party to this | 134 | released version of the Licensed Software, but only upcoming version(s). |
135 | |||
136 | “Licensee” shall mean the individual or legal entity that is party to this | ||
119 | Agreement, as identified on the signature page hereof. | 137 | Agreement, as identified on the signature page hereof. |
120 | 138 | ||
121 | "Licensee's Records" shall mean books and records that are likely to contain | 139 | “Licensee’s Records” shall mean books and records that are likely to contain |
122 | information bearing on Licensee's compliance with this Agreement or the | 140 | information bearing on Licensee’s compliance with this Agreement, Licensee’s use |
123 | payments due to The Qt Company under this Agreement, including, but not limited | 141 | of Open Source Qt and/or the payments due to The Qt Company under this |
124 | to: assembly logs, sales records and distribution records. | 142 | Agreement, including, but not limited to user information, assembly logs, sales |
143 | records and distribution records. | ||
125 | 144 | ||
126 | "Modified Software" shall have the meaning as set forth in Section 2.3. | 145 | “Modified Software” shall have the meaning as set forth in Section 2.3. |
127 | 146 | ||
128 | "Online Services" shall mean any services or access to systems made available | 147 | “Online Services” shall mean any services or access to systems made available by |
129 | by The Qt Company to the Licensee over the Internet relating to the Licensed | 148 | The Qt Company to the Licensee over the Internet relating to the Licensed |
130 | Software or for the purpose of use by the Licensee of the Licensed Software or | 149 | Software or for the purpose of use by the Licensee of the Licensed Software or |
131 | Support. Use of any such Online Services is discretionary for the Licensee and | 150 | Support. Use of any such Online Services is discretionary for the Licensee and |
132 | some of them may be subject to additional fees. | 151 | some of them may be subject to additional fees. |
133 | 152 | ||
134 | "Open Source Qt" shall mean the non-commercial Qt computer software products, | 153 | “Open Source Qt” shall mean the non-commercial Qt computer software products, |
135 | licensed under the terms of the GNU Lesser General Public License, version | 154 | licensed under the terms of the GNU Lesser General Public License, version 2.1 |
136 | 2.1 or later ("LGPL") or the GNU General Public License, version 2.0 or later | 155 | or later (“LGPL”) or the GNU General Public License, version 2.0 or later |
137 | ("GPL"). For clarity, Open Source Qt shall not be provided nor governed under | 156 | (“GPL”). For clarity, Open Source Qt shall not be provided nor governed under |
138 | this Agreement. | 157 | this Agreement. |
139 | 158 | ||
140 | "Party" or "Parties" shall mean Licensee and/or The Qt Company. | 159 | ”Party” or “Parties” shall mean Licensee and/or The Qt Company. |
141 | 160 | ||
142 | "Redistributables" shall mean the portions of the Licensed Software set forth | 161 | “Permitted Combination” shall have the meaning as set forth in Section |
143 | in Appendix 1, Section 1 that may be distributed pursuant to the terms of this | 162 | 3.4(viii). |
144 | Agreement in object code form only, including any relevant documentation. | ||
145 | Where relevant, any reference to Licensed Software in this Agreement shall | ||
146 | include and refer also to Redistributables. | ||
147 | 163 | ||
148 | "Renewal Term" shall mean an extension of previous License Term as agreed | 164 | “Pre-Release Code” shall have the meaning as set forth in Section 4. |
149 | between the Parties. | 165 | |
166 | “Prohibited Combination” shall mean any means to (i) use, combine, incorporate, | ||
167 | link or integrate Licensed Software with any software created with or | ||
168 | incorporating Open Source Qt, (ii) use Licensed Software for creation of any | ||
169 | software created with or incorporating Open Source Qt, or (iii) incorporate or | ||
170 | integrate Applications into a hardware device or product other than a Device. | ||
150 | 171 | ||
151 | "Submitted Modified Software" shall have the meaning as set forth in | 172 | “Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D |
152 | Section 2.3. | 173 | user interface design and development environment for rapid designing and |
174 | prototyping of animated user interfaces. | ||
153 | 175 | ||
154 | "Support" shall mean standard developer support that is provided by The Qt | 176 | “Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio |
155 | Company to assist Designated Users in using the Licensed Software in | 177 | tool, a user interface design and development environment for rapid designing |
156 | accordance with The Qt Company's standard support terms and as further | 178 | and prototyping of animated user interfaces. |
157 | defined in Section 8 hereunder. | ||
158 | 179 | ||
159 | "Taxes" shall have the meaning set forth in Section 10.5. | 180 | “Qt for Application Development” shall mean The Qt Company’s productized |
181 | offering, which consist of all versions of | ||
182 | (i) Qt Toolkit, and | ||
183 | (ii) Qt Tools/Applications. | ||
160 | 184 | ||
161 | "Term" shall have the meaning set forth in Section 12. | 185 | “Qt for Device Creation” shall mean The Qt Company’s productized offering, which |
186 | consist of all versions of | ||
187 | (i) Qt for Application Development, and | ||
188 | (ii) Software components specific to embedded software development as set | ||
189 | forth in Appendix 1, Sections 1b and 1d. | ||
162 | 190 | ||
163 | "The Qt Company" shall mean: | 191 | “Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a. |
164 | 192 | ||
165 | (i) in the event Licensee is an individual residing in the United States or a | 193 | “Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c. |
166 | legal entity incorporated in the United States or having its headquarters in | 194 | |
167 | the United States, The Qt Company Inc., a Delaware corporation with its office | 195 | "Redistributables" shall mean the portions of the Licensed Software set forth in |
168 | at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, USA.; or | 196 | Appendix 1, Section 2 that may be distributed pursuant to the terms of this |
197 | Agreement in object code form only, including any relevant documentation. Where | ||
198 | relevant, any reference to Licensed Software in this Agreement shall include and | ||
199 | refer also to Redistributables. | ||
200 | |||
201 | “Renewal Term” shall mean an extension of previous License Term as agreed | ||
202 | between the Parties. | ||
169 | 203 | ||
170 | (ii) in the event the Licensee is an individual residing outside of the United | 204 | “Submitted Modified Software” shall have the meaning as set forth in Section |
171 | States or a legal entity incorporated outside of the United States or having | 205 | 2.3. |
172 | its registered office outside of the United States, The Qt Company Ltd., a | 206 | |
173 | Finnish company with its registered office at Bertel Jungin aukio D3A, 02600 | 207 | “Support” shall mean standard developer support that is provided by The Qt |
174 | Espoo, Finland. | 208 | Company to assist Designated Users in using the Licensed Software in accordance |
209 | with The Qt Company’s standard support terms available at | ||
210 | https://www.qt.io/terms-conditions/ and as further defined in Section 8 | ||
211 | hereunder. | ||
212 | |||
213 | “Taxes” shall have the meaning set forth in Section 10.5. | ||
214 | |||
215 | “Term” shall have the meaning set forth in Section 12. | ||
216 | |||
217 | “The Qt Company” shall mean: | ||
218 | (i) in the event Licensee is an individual residing in the United States | ||
219 | or a legal entity incorporated in the United States or having its | ||
220 | headquarters in the United States, The Qt Company Inc., a | ||
221 | Delaware corporation with its office at 2350 Mission College Blvd., | ||
222 | Suite 1020, Santa Clara, CA 95054, USA.; or | ||
223 | (ii) in the event the Licensee is an individual residing outside of the | ||
224 | United States or a legal entity incorporated outside of the United | ||
225 | States or having its registered office outside of the United States, | ||
226 | The Qt Company Ltd., a Finnish company with its registered office at | ||
227 | Bertel Jungin aukio D3A, 02600 Espoo, Finland. | ||
175 | 228 | ||
176 | "Third Party Software " shall have the meaning set forth in Section 4. | 229 | "Third Party Software " shall have the meaning set forth in Section 4. |
177 | 230 | ||
178 | "Updates" shall mean a release or version of the Licensed Software containing | 231 | “Updates” shall mean a release or version of the Licensed Software containing |
179 | bug fixes, error corrections and other changes that are generally made | 232 | bug fixes, error corrections and other changes that are generally made available |
180 | available to users of the Licensed Software that have contracted for Support. | 233 | to users of the Licensed Software that have contracted for Support. Updates are |
181 | Updates are generally depicted as a change to the digits following the decimal | 234 | generally depicted as a change to the digits following the decimal in the |
182 | in the Licensed Software version number. The Qt Company shall make Updates | 235 | Licensed Software version number. The Qt Company shall make Updates available to |
183 | available to the Licensee under the Support. Updates shall be considered as | 236 | the Licensee under the Support. Updates shall be considered as part of the |
184 | part of the Licensed Software hereunder. | 237 | Licensed Software hereunder. |
185 | 238 | ||
186 | "Upgrades" shall mean a release or version of the Licensed Software containing | 239 | “Upgrades” shall mean a release or version of the Licensed Software containing |
187 | enhancements and new features and are generally depicted as a change to the | 240 | enhancements and new features and are generally depicted as a change to the |
188 | first digit of the Licensed Software version number. In the event Upgrades are | 241 | first digit of the Licensed Software version number. In the event Upgrades are |
189 | provided to the Licensee under this Agreement, they shall be considered as | 242 | provided to the Licensee under this Agreement, they shall be considered as part |
190 | part of the Licensed Software hereunder. | 243 | of the Licensed Software hereunder. |
244 | |||
191 | 245 | ||
192 | 2. OWNERSHIP | 246 | 2. OWNERSHIP |
193 | 247 | ||
194 | 2.1 Ownership of The Qt Company | 248 | 2.1 Ownership of The Qt Company |
195 | 249 | The Licensed Software is protected by copyright laws and international copyright | |
196 | The Licensed Software is protected by copyright laws and international | 250 | treaties, as well as other intellectual property laws and treaties. The Licensed |
197 | copyright treaties, as well as other intellectual property laws and treaties. | 251 | Software is licensed, not sold. All of The Qt Company's Intellectual Property |
198 | The Licensed Software is licensed, not sold. | 252 | Rights are and shall remain the exclusive property of The Qt Company or its |
199 | 253 | licensors respectively. | |
200 | All The Qt Company's Intellectual Property Rights are and shall remain the | ||
201 | exclusive property of The Qt Company or its licensors respectively. | ||
202 | 254 | ||
203 | 2.2 Ownership of Licensee | 255 | 2.2 Ownership of Licensee |
204 | |||
205 | All the Licensee's Intellectual Property Rights are and shall remain the | 256 | All the Licensee's Intellectual Property Rights are and shall remain the |
206 | exclusive property of the Licensee or its licensors respectively. | 257 | exclusive property of the Licensee or its licensors respectively. All |
207 | 258 | Intellectual Property Rights to the Modified Software, Applications and Devices | |
208 | All Intellectual Property Rights to the Modified Software, Applications and | 259 | shall remain with the Licensee and no rights thereto shall be granted by the |
209 | Devices shall remain with the Licensee and no rights thereto shall be granted | 260 | Licensee to The Qt Company under this Agreement (except as set forth in Section |
210 | by the Licensee to The Qt Company under this Agreement (except as set forth in | 261 | 2.3 below). |
211 | Section 2.3 below). | ||
212 | 262 | ||
213 | 2.3 Modified Software | 263 | 2.3 Modified Software |
214 | |||
215 | Licensee may create bug-fixes, error corrections, patches or modifications to | 264 | Licensee may create bug-fixes, error corrections, patches or modifications to |
216 | the Licensed Software ("Modified Software"). Such Modified Software may break | 265 | the Licensed Software (“Modified Software”). Such Modified Software may break |
217 | the source or binary compatibility with the Licensed Software (including | 266 | the source or binary compatibility with the Licensed Software (including without |
218 | without limitation through changing the application programming interfaces | 267 | limitation through changing the application programming interfaces ("API") or by |
219 | ("API") or by adding, changing or deleting any variable, method, or class | 268 | adding, changing or deleting any variable, method, or class signature in the |
220 | signature in the Licensed Software and/or any inter-process protocols, services | 269 | Licensed Software and/or any inter-process protocols, services or standards in |
221 | or standards in the Licensed Software libraries). To the extent that Licensee's | 270 | the Licensed Software libraries). To the extent that Licensee’s Modified |
222 | Modified Software so breaks source or binary compatibility with the Licensed | 271 | Software so breaks source or binary compatibility with the Licensed Software, |
223 | Software, Licensee acknowledges that The Qt Company's ability to provide | 272 | Licensee acknowledges that The Qt Company's ability to provide Support may be |
224 | Support may be prevented or limited and Licensee's ability to make use of | 273 | prevented or limited and Licensee's ability to make use of Updates may be |
225 | Updates may be restricted. | 274 | restricted. |
226 | 275 | ||
227 | Licensee may, at its sole and absolute discretion, choose to submit Modified | 276 | Licensee may, at its sole and absolute discretion, choose to submit Modified |
228 | Software to The Qt Company ("Submitted Modified Software") in connection with | 277 | Software to The Qt Company (“Submitted Modified Software”) in connection with |
229 | Licensee's Support request, service request or otherwise. In the event Licensee | 278 | Licensee’s Support request, service request or otherwise. In the event Licensee |
230 | does so, then, Licensee hereby grants The Qt Company a sublicensable, | 279 | does so, then, Licensee hereby grants The Qt Company a sublicensable, |
231 | assignable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free and | 280 | assignable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free and |
232 | fully paid-up license, under all of Licensee's Intellectual Property Rights, to | 281 | fully paid-up license, under all of Licensee’s Intellectual Property Rights, to |
233 | reproduce, adapt, translate, modify, and prepare derivative works of, publicly | 282 | reproduce, adapt, translate, modify, and prepare derivative works of, publicly |
234 | display, publicly perform, sublicense, make available and distribute such | 283 | display, publicly perform, sublicense, make available and distribute such |
235 | Submitted Modified Software as The Qt Company sees fit at its free and absolute | 284 | Submitted Modified Software as The Qt Company sees fit at its free and absolute |
236 | discretion. | 285 | discretion. |
237 | 286 | ||
287 | |||
238 | 3. LICENSES GRANTED | 288 | 3. LICENSES GRANTED |
239 | 289 | ||
240 | 3.1 Development with Licensed Software | 290 | 3.1 Development with Licensed Software |
241 | |||
242 | Subject to the terms of this Agreement, The Qt Company grants to Licensee a | 291 | Subject to the terms of this Agreement, The Qt Company grants to Licensee a |
243 | personal, worldwide, non-exclusive, non-transferable license, valid for the | 292 | worldwide, non- exclusive, non-transferable license, valid for the License Term, |
244 | License Term, to use, modify and copy the Licensed Software by Designated Users | 293 | to use, modify and copy the Licensed Software by Designated Users on the |
245 | on the Development Platforms for the sole purposes of designing, developing, | 294 | Development Platforms for the sole purposes of designing, developing, |
246 | demonstrating and testing Application(s) and/or Devices, and to provide thereto | 295 | demonstrating and testing Application(s) and/or Devices, and to provide thereto |
247 | related support and other related services to end-user Customers. | 296 | related support and other related services to end-user Customers. |
248 | 297 | ||
249 | Licensee may install copies of the Licensed Software on an unlimited number of | 298 | Licensee may install copies of the Licensed Software on five (5) computers per |
250 | computers provided that (i) only the Designated Users may use the Licensed | 299 | Designated User, provided that only the Designated Users who have a valid |
251 | Software, and (ii) all Designated Users must have a valid Development License | 300 | Development License may use the Licensed Software. |
252 | to use Licensed Software. | ||
253 | 301 | ||
254 | Licensee may at any time designate another Designated User to replace a then- | 302 | Licensee may at any time designate another Designated User to replace a |
255 | current Designated User by notifying The Qt Company in writing, provided that | 303 | then-current Designated User by notifying The Qt Company in writing, provided |
256 | any Designated User may be replaced only once during any six-month period. | 304 | that any Designated User may be replaced only once during any six-month period. |
257 | 305 | ||
258 | Upon expiry of the initially agreed License Term, the respective License Terms | 306 | Upon expiry of the initially agreed License Term, the respective License Terms |
259 | shall be automatically extended to one or more Renewal Term(s), unless and | 307 | shall be automatically extended to one or more Renewal Term(s), unless and until |
260 | until either Party notifies the other Party in writing that it does not wish to | 308 | either Party notifies the other Party in writing that it does not wish to |
261 | continue the License Term, such notification to be provided to the other Party | 309 | continue the License Term, such notification to be provided to the other Party |
262 | no less than ninety (90) days before expiry of the respective License Term. | 310 | no less than ninety (90) days before expiry of the respective License Term. |
263 | Unless otherwise agreed between the Parties, Renewal Term shall be of equal | 311 | Unless otherwise agreed between the Parties, Renewal Term shall be of equal |
264 | length with the initial Term. | 312 | length with the initial License Term. |
265 | 313 | ||
266 | Any such Renewal Term shall be subject to License Fees agreed between the | 314 | Any such Renewal Term shall be subject to License Fees agreed between the |
267 | Parties or, if no advance agreement exists, subject to The Qt Company's | 315 | Parties or, if no advance agreement exists, subject to The Qt Company’s standard |
268 | standard pricing applicable at the commencement date of any such Renewal Term. | 316 | pricing applicable at the commencement date of any such Renewal Term. |
317 | |||
318 | Any price or other term specified for a Renewal Term shall be valid only for the | ||
319 | specified time. The Qt Company may request the Licensee to place a purchase | ||
320 | order corresponding to a quote by The Qt Company for the relevant Renewal Term. | ||
321 | |||
322 | In the event Licensee does not prevent auto-renewal pursuant the above, but a | ||
323 | Renewal Term is nevertheless not duly ordered within 30 days from the date of | ||
324 | the respective quote from The Qt Company and/or the respective License Fee paid | ||
325 | by due date specified in The Qt Company’s respective invoice, The Qt Company | ||
326 | shall apply a reinstatement fee equal to ten percent (10 %) of the total value | ||
327 | of the License Fees of the Development Licenses for the expired term to be added | ||
328 | to the License Fee of the respective Renewal Term. | ||
329 | |||
330 | In the event Licensee chooses not to renew a Development License for a Renewal | ||
331 | Term by notifying The Qt Company thereof no less than ninety (90) days before | ||
332 | expiry of the respective License Term, Licensee may still reinstate such expired | ||
333 | Development Licenses for a Renewal Term subject to applicable renewal Term | ||
334 | License Fees until thirty (30) days from the expiry of the initially agreed | ||
335 | License Term or preceding Renewal Term. After such thirty (30) day period a | ||
336 | Development License shall be subject to applicable License Fees for a new | ||
337 | Development License and not any Renewal Term License Fees. | ||
269 | 338 | ||
270 | 3.2 Distribution of Applications | 339 | 3.2 Distribution of Applications |
271 | |||
272 | Subject to the terms of this Agreement, The Qt Company grants to Licensee a | 340 | Subject to the terms of this Agreement, The Qt Company grants to Licensee a |
273 | personal, worldwide, non-exclusive, non-transferable, revocable (for cause | 341 | worldwide, non- exclusive, non-transferable, revocable (for cause pursuant to |
274 | pursuant to this Agreement) right and license, valid for the Term, to | 342 | this Agreement) right and license, valid for the Term, to |
275 | 343 | (i) distribute, by itself or through its Contractors, Redistributables as | |
276 | (i) distribute, by itself or through its Contractors, Redistributables as | 344 | installed, incorporated or integrated into Applications for execution |
277 | installed, incorporated or integrated into Applications for execution on the | 345 | on the Deployment Platforms, and |
278 | Deployment Platforms, and | 346 | (ii) grant sublicenses to Redistributables, as distributed hereunder, for |
279 | 347 | Customers solely for Customer’s internal use and to the extent | |
280 | (ii) grant sublicenses to Redistributables, as distributed hereunder, for | 348 | necessary in order for the Customers to use the Applications for their |
281 | Customers solely for Customer's internal use and to the extent necessary in | 349 | respective intended purposes. |
282 | order for the Customers to use the Applications for their respective intended | ||
283 | purposes. | ||
284 | 350 | ||
285 | Right to distribute the Redistributables as part of an Application as provided | 351 | Right to distribute the Redistributables as part of an Application as provided |
286 | herein is not royalty-bearing but is conditional upon the Licensee having paid | 352 | herein is not royalty- bearing but is conditional upon the Licensee not having |
287 | the agreed Development Licenses from The Qt Company before distributing any | 353 | any unpaid License Fees for Development Licenses owed to The Qt Company at the |
288 | Redistributables to Customers. | 354 | time of distribution of any Redistributables to Customers. |
289 | 355 | ||
290 | 3.3 Distribution of Devices | 356 | 3.3 Distribution of Devices |
291 | |||
292 | Subject to the terms of this Agreement, The Qt Company grants to Licensee a | 357 | Subject to the terms of this Agreement, The Qt Company grants to Licensee a |
293 | personal, worldwide, non-exclusive, non-transferable, revocable (for cause | 358 | worldwide, non- exclusive, non-transferable, revocable (for cause pursuant to |
294 | pursuant to this Agreement) right and license, valid for the Term, to | 359 | this Agreement) right and license, valid for the Term, to |
295 | 360 | (i) distribute, by itself or through one or more tiers of Contractors, | |
296 | (i) distribute, by itself or through one or more tiers of Contractors, | 361 | Redistributables as installed, incorporated or integrated, or intended |
297 | Redistributables as installed, incorporated or integrated, or intended to be | 362 | to be installed, incorporated or integrated into Devices for execution |
298 | installed, incorporated or integrated into Devices for execution on the | 363 | on the Deployment Platforms, and |
299 | Deployment Platforms, and | 364 | (ii) grant sublicenses to Redistributables, as distributed hereunder, for |
300 | 365 | Customers solely for Customer’s internal use and to the extent | |
301 | (ii) grant sublicenses to Redistributables, as distributed hereunder, for | 366 | necessary in order for the Customers to use the Devices for their |
302 | Customers solely for Customer's internal use and to the extent necessary in | 367 | respective intended purposes. |
303 | order for the Customers to use the Devices for their respective intended | ||
304 | purposes. | ||
305 | 368 | ||
306 | Right to distribute the Redistributables with Devices as provided herein is | 369 | Right to distribute the Redistributables with Devices as provided herein is |
307 | conditional upon the Licensee having purchased and paid the appropriate amount | 370 | conditional upon the Licensee (i) not having any unpaid License Fees for |
308 | of Development and Distribution Licenses from The Qt Company before | 371 | Development Licenses owed to The Qt Company, and (ii) having purchased and paid |
309 | distributing any Redistributables to Customers. | 372 | corresponding Distribution Licenses at the time of distribution of any |
373 | Redistributables to Customers. | ||
310 | 374 | ||
311 | 3.4 Further Requirements | 375 | 3.4 Further Requirements |
312 | |||
313 | The licenses granted above in this Section 3 by The Qt Company to Licensee are | 376 | The licenses granted above in this Section 3 by The Qt Company to Licensee are |
314 | conditional and subject to Licensee's compliance with the following terms: | 377 | conditional and subject to Licensee's compliance with the following terms: |
315 | 378 | (i) Licensee shall not remove or alter any copyright, trademark or other | |
316 | (i) Licensee shall not remove or alter any copyright, trademark or other | 379 | proprietary rights notice(s) contained in any portion of the Licensed |
317 | proprietary rights notice contained in any portion of the Licensed Software; | 380 | Software; |
318 | 381 | (ii) Applications must add primary and substantial functionality to the | |
319 | (ii) Applications must add primary and substantial functionality to the | 382 | Licensed Software so as not to compete with the Licensed Software; |
320 | Licensed Software; | 383 | (iii) Applications may not pass on functionality which in any way makes it |
321 | 384 | possible for others to create software with the Licensed Software; | |
322 | (iii) Applications may not pass on functionality which in any way makes it | 385 | provided however that Licensee may use the Licensed Software's |
323 | possible for others to create software with the Licensed Software; provided | 386 | scripting and QML ("Qt Quick") functionality solely in order to enable |
324 | however that Licensee may use the Licensed Software's scripting and QML ("Qt | 387 | scripting, themes and styles that augment the functionality and |
325 | Quick") functionality solely in order to enable scripting, themes and styles | 388 | appearance of the Application(s) without adding primary and |
326 | that augment the functionality and appearance of the Application(s) without | 389 | substantial functionality to the Application(s); |
327 | adding primary and substantial functionality to the Application(s); | 390 | (iv) Licensee shall not use Licensed Software in any manner or for any |
328 | 391 | purpose that infringes, misappropriates or otherwise violates any | |
329 | (iv) Applications must not compete with the Licensed Software; | 392 | Intellectual property or right of any third party, or that violates |
330 | 393 | any applicable law; | |
331 | (v) Licensee shall not use The Qt Company's or any of its suppliers' names, | 394 | (v) Licensee shall not use The Qt Company's or any of its suppliers' |
332 | logos, or trademarks to market Applications, except that Licensee may use | 395 | names, logos, or trademarks to market Applications, except that |
333 | "Built with Qt" logo to indicate that Application(s) was developed using the | 396 | Licensee may use “Built with Qt” logo to indicate that Application(s) |
334 | Licensed Software; | 397 | was developed using the Licensed Software; |
335 | 398 | (vi) Licensee shall not distribute, sublicense or disclose source code of | |
336 | (vi) Licensee shall not distribute, sublicense or disclose source code of | 399 | Licensed Software to any third party (provided however that Licensee |
337 | Licensed Software to any third party (provided however that Licensee may | 400 | may appoint employee(s) of Contractors as Designated Users to use |
338 | appoint employee(s) of Contractors as Designated Users to use Licensed | 401 | Licensed Software pursuant to this Agreement). Such right may be |
339 | Software pursuant to this Agreement). Such right may be available for the | 402 | available for the Licensee subject to a separate software development |
340 | Licensee subject to a separate software development kit ("SDK") license | 403 | kit (“SDK”) license agreement to be concluded with The Qt Company; |
341 | agreement to be concluded with The Qt Company; | 404 | (vii) Licensee shall not grant the Customers a right to (i) make copies of |
342 | 405 | the Redistributables except when and to the extent required to use the | |
343 | (vii) Licensee shall not grant the Customers a right to (i) make copies of the | 406 | Applications and/or Devices for their intended purpose, (ii) modify |
344 | Redistributables except when and to the extent required to use the Applications | 407 | the Redistributables or create derivative works thereof, (iii) |
345 | and/or Devices for their intended purpose, (ii) modify the Redistributables or | 408 | decompile, disassemble or otherwise reverse engineer Redistributables, |
346 | create derivative works thereof, (iii) decompile, disassemble or otherwise | 409 | or (iv) redistribute any copy or portion of the Redistributables to |
347 | reverse engineer Redistributables, or (iv) redistribute any copy or portion of | 410 | any third party, except as part of the onward sale of the Device on |
348 | the Redistributables to any third party, except as part of the onward sale of | 411 | which the Redistributables are installed; |
349 | the Device on which the Redistributables are installed; | 412 | (viii) Licensee shall not and shall cause that its Affiliates or Contractors |
350 | 413 | shall not use Licensed Software in any Prohibited Combination, unless | |
351 | (viii) Licensee shall not and shall cause that its Affiliates or Contractors | 414 | Licensee has received an advance written permission from The Qt |
352 | shall not a) in any way combine, incorporate or integrate Licensed Software | 415 | Company to do so. Absent such written permission, any and all |
353 | with, or use Licensed Software for creation of, any software created with or | 416 | distribution by the Licensee during the Term of a hardware device or |
354 | incorporating Open Source Qt, or b) incorporate or integrate Applications | 417 | product a) which incorporate or integrate any part of Licensed |
355 | into a hardware device or product other than a Device, unless Licensee has | 418 | Software or Open Source Qt; or b) where the main user interface or |
356 | received an advance written permission from The Qt Company to do so. Absent | 419 | substantial functionality is provided by software built with |
357 | such written permission, any and all distribution by the Licensee during the | 420 | Licensed Software or Open Source Qt or otherwise depends on the |
358 | Term of a hardware device or product a) which incorporate or integrate any | 421 | Licensed Software or Open Source Qt, shall be considered to be |
359 | part of Licensed Software or Open Source Qt; or b) where the main user | 422 | Device distribution under this Agreement and shall be dependent on |
360 | interface or substantial functionality is provided by software build with | 423 | Licensee’s compliance thereof (including but not limited to |
361 | Licensed Software or Open Source Qt or otherwise depends on the Licensed | 424 | obligation to pay applicable License Fees for such distribution). |
362 | Software or Open Source Qt, shall be considered as a Device distribution under | 425 | Notwithstanding what is provided above in this sub-section (viii), |
363 | this Agreement and dependent on compliance thereof (including but not limited | 426 | Licensee is entitled to use and combine Qt 3D Studio and/or Qt |
364 | to obligation to pay applicable License Fees for such distribution); | 427 | Design Studio with Open Source Qt (“Permitted Combination”) for |
365 | 428 | its internal evaluation purposes, provided that Licensee shall in no | |
366 | (ix) Licensee shall cause all of its Affiliates and Contractors entitled to | 429 | way transfer, publish, disclose, display or otherwise make available |
367 | make use of the licenses granted under this Agreement, to be contractually | 430 | any software or work resulting from such Permitted Combination; |
368 | bound to comply with the relevant terms of this Agreement and not to use the | 431 | (ix) Licensee shall cause all of its Affiliates and Contractors entitled |
369 | Licensed Software beyond the terms hereof and for any purposes other than | 432 | to make use of the licenses granted under this Agreement, to be |
370 | operating within the scope of their services for Licensee. Licensee shall be | 433 | contractually bound to comply with the relevant terms of this |
371 | responsible for any and all actions and omissions of its Affiliates and | 434 | Agreement and not to use the Licensed Software beyond the terms |
372 | Contractors relating to the Licensed Software and use thereof (including but | 435 | hereof and for any purposes other than operating within the scope of |
373 | not limited to payment of all applicable License Fees); | 436 | their services for Licensee. Licensee shall be responsible for any |
374 | 437 | and all actions and omissions of its Affiliates and Contractors | |
375 | (x) Except when and to the extent explicitly provided in this Section 3, | 438 | relating to the Licensed Software and use thereof (including but not |
376 | Licensee shall not transfer, publish, disclose, display or otherwise make | 439 | limited to payment of all applicable License Fees); |
377 | available the Licensed Software; | 440 | (x) Except when and to the extent explicitly provided in this Section 3, |
378 | 441 | Licensee shall not transfer, publish, disclose, display or otherwise | |
379 | ; and | 442 | make available the Licensed Software; and |
380 | 443 | (xi) Licensee shall not attempt or enlist a third party to conduct or | |
381 | (xi) Licensee shall not attempt or enlist a third party to conduct or attempt | 444 | attempt to conduct any of the above. |
382 | to conduct any of the above. | ||
383 | 445 | ||
384 | Above terms shall not be applicable if and to the extent they conflict with any | 446 | Above terms shall not be applicable if and to the extent they conflict with any |
385 | mandatory provisions of any applicable laws. | 447 | mandatory provisions of any applicable laws. Any use of Licensed Software |
448 | beyond the provisions of this Agreement is strictly prohibited and requires an | ||
449 | additional license from The Qt Company. | ||
386 | 450 | ||
387 | Any use of Licensed Software beyond the provisions of this Agreement is | ||
388 | strictly prohibited and requires an additional license from The Qt Company. | ||
389 | 451 | ||
390 | 4. THIRD PARTY SOFTWARE | 452 | 4. THIRD PARTY SOFTWARE |
391 | |||
392 | The Licensed Software may provide links to third party libraries or code | 453 | The Licensed Software may provide links to third party libraries or code |
393 | (collectively "Third Party Software") to implement various functions. Third | 454 | (collectively "Third Party Software") to implement various functions. Third |
394 | Party Software does not comprise part of the Licensed Software. In some cases, | 455 | Party Software does not comprise part of the Licensed Software. In some cases, |
395 | access to Third Party Software may be included in the Licensed Software. Such | 456 | access to Third Party Software may be included with the Licensed Software. Such |
396 | Third Party Software will be listed in the ".../src/3rdparty" source tree | 457 | Third Party Software will be listed in the ".../src/3rdparty" source tree |
397 | delivered with the Licensed Software or documented in the Licensed Software, as | 458 | delivered with the Licensed Software or documented in the Licensed Software, as |
398 | such may be amended from time to time. Licensee acknowledges that use or | 459 | such may be amended from time to time. Licensee acknowledges that use or |
399 | distribution of Third Party Software is in all respects subject to applicable | 460 | distribution of Third Party Software is in all respects subject to applicable |
400 | license terms of applicable third party right holders. | 461 | license terms of applicable third party right holders. |
401 | 462 | ||
463 | |||
402 | 5. PRE-RELEASE CODE | 464 | 5. PRE-RELEASE CODE |
465 | The Licensed Software may contain pre-release code and functionality, or sample | ||
466 | code marked or otherwise stated with appropriate designation such as “Technology | ||
467 | Preview”, “Alpha”, “Beta”, “Sample” etc. (“Pre-Release Code”). | ||
468 | |||
469 | Such Pre-Release Code may be present complimentary for the Licensee, in order to | ||
470 | provide experimental support or information for new platforms or preliminary | ||
471 | versions of one or more new functionalities or for other similar reasons. The | ||
472 | Pre-Release Code may not be at the level of performance and compatibility of a | ||
473 | final, generally available, product offering. The Pre-Release Code may not | ||
474 | operate correctly, may contain errors and may be substantially modified by The | ||
475 | Qt Company prior to the first commercial product release, if any. The Qt Company | ||
476 | is under no obligation to make Pre-Release Code commercially available, or | ||
477 | provide any Support or Updates relating thereto. The Qt Company assumes no | ||
478 | liability whatsoever regarding any Pre-Release Code, but any use thereof is | ||
479 | exclusively at Licensee’s own risk and expense. | ||
480 | |||
481 | For clarity, unless Licensed Software specifies different license terms for the | ||
482 | respective Pre- Release Code, the Licensee is entitled to use such pre-release | ||
483 | code pursuant to Section 3, just like other Licensed Software, provided however | ||
484 | that in the event Add-on Products are included and available as such Pre-Release | ||
485 | Code, Licensee’s right to use such Add-on Products is nevertheless subject to | ||
486 | and conditional upon conclusion of separate agreement with The Qt Company. | ||
403 | 487 | ||
404 | The Licensed Software may contain pre-release code and functionality marked or | ||
405 | otherwise stated as "Technology Preview", "Alpha", "Beta" or similar | ||
406 | designation. Such pre-release code may be present in order to provide | ||
407 | experimental support for new platforms or preliminary versions of one or more | ||
408 | new functionalities. The pre-release code may not be at the level of | ||
409 | performance and compatibility of a final, generally available, product | ||
410 | offering of the Licensed Software. The pre-release parts of the Licensed | ||
411 | Software may not operate correctly, may contain errors and may be substantially | ||
412 | modified by The Qt Company prior to the first commercial product release, if | ||
413 | any. The Qt Company is under no obligation to make pre-release code | ||
414 | commercially available, or provide any Support or Updates relating thereto. The | ||
415 | Qt Company assumes no liability whatsoever regarding any pre-release code, but | ||
416 | any use thereof is exclusively at Licensee's own risk and expense. | ||
417 | 488 | ||
418 | 6. LIMITED WARRANTY AND WARRANTY DISCLAIMER | 489 | 6. LIMITED WARRANTY AND WARRANTY DISCLAIMER |
419 | |||
420 | The Qt Company hereby represents and warrants that it has the power and | 490 | The Qt Company hereby represents and warrants that it has the power and |
421 | authority to grant the rights and licenses granted to Licensee under this | 491 | authority to grant the rights and licenses granted to Licensee under this |
422 | Agreement. | 492 | Agreement. Except as set forth above, the Licensed Software is licensed to |
423 | 493 | Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire | |
424 | Except as set forth above, the Licensed Software is licensed to Licensee | 494 | liability for errors in the Licensed Software shall be limited, at The Qt |
425 | "as is" and Licensee's exclusive remedy and The Qt Company's entire liability | 495 | Company’s option, to correction of the error, replacement of the Licensed |
426 | for errors in the Licensed Software shall be limited, at The Qt Company's | 496 | Software or return of the applicable fees paid for the defective Licensed |
427 | option, to correction of the error, replacement of the Licensed Software or | 497 | Software for the time period during which the License is not able to utilize the |
428 | return of the applicable fees paid for the defective Licensed Software for the | 498 | Licensed Software under the terms of this Agreement. |
429 | time period during which the License is not able to utilize the Licensed | ||
430 | Software under the terms of this Agreement. | ||
431 | 499 | ||
432 | TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF | 500 | TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF |
433 | ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER | 501 | ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER |
434 | WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED | 502 | WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED |
435 | WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON- | 503 | WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND |
436 | INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT | 504 | NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT |
437 | WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR THAT | 505 | WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT |
438 | IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE | 506 | IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE |
439 | UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE | 507 | UNINTERRUPTED. |
440 | RISK OF AND RESPONSIBILITY OF LICENSEE. | 508 | |
441 | 509 | ||
442 | 7. INDEMNIFICATION AND LIMITATION OF LIABILITY | 510 | 7. INDEMNIFICATION AND LIMITATION OF LIABILITY |
443 | 511 | ||
444 | 7.1 Limitation of Liability | 512 | 7.1 Limitation of Liability |
445 | |||
446 | EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) | 513 | EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) |
447 | BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO | 514 | BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO |
448 | EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, | 515 | EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, |
449 | LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, | 516 | LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, |
450 | CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, | 517 | CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, |
451 | HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES | 518 | HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. |
452 | SPECIFICALLY AGREE THAT LICENSEE'S OBLIGATION TO PAY LICENSE AND OTHER FEES | ||
453 | CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE | ||
454 | CONSIDERED AS A DIRECT DAMAGE. | ||
455 | 519 | ||
456 | EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) | 520 | EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) |
457 | BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN | 521 | BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO |
458 | NO EVENT SHALL EITHER PARTY'S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT | 522 | EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT EXCEED |
459 | EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT COMPANY FROM | 523 | THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT COMPANY FROM LICENSEE |
460 | LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE | 524 | DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE EVENT |
461 | EVENT RESULTING IN SUCH LIABILITY. | 525 | RESULTING IN SUCH LIABILITY. THE PROVISIONS OF THIS SECTION 7 ALLOCATE THE |
462 | 526 | RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE AND THE PARTIES | |
463 | THE PROVISIONS OF THIS SECTION 7 ALLOCATE THE RISKS UNDER THIS AGREEMENT | 527 | HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING WHETHER TO |
464 | BETWEEN THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE | 528 | ENTER INTO THIS AGREEMENT. NOTWITHSTANDING ANYTHING TO THE CONTRARY IN THIS |
465 | LIMITATIONS SET FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS AGREEMENT. | 529 | AGREEMENT, LICENSEE SHALL ALWAYS BE LIABLE TO PAY THE APPLICABLE LICENSE FEES |
466 | 530 | CORRESPONDING TO ITS ACTUAL USE OF LICENSED SOFTWARE. | |
467 | 7.2 Licensee's Indemnification | ||
468 | 531 | ||
469 | Licensee shall indemnify and hold harmless The Qt Company from and against any | ||
470 | claim, injury, judgment, settlement, loss or expense, including attorneys' fees | ||
471 | related to: (a) Licensee's misrepresentation in connection with The Qt Company | ||
472 | or the Licensed Software or breach of this Agreement, (b) the Application or | ||
473 | Device (except where such cause of liability is solely attributable to the | ||
474 | Licensed Software). | ||
475 | 532 | ||
476 | 8. SUPPORT, UPDATES AND ONLINE SERVICES | 533 | 8. SUPPORT, UPDATES AND ONLINE SERVICES |
477 | |||
478 | Upon due payment of the agreed License Fees the Licensee will be eligible to | 534 | Upon due payment of the agreed License Fees the Licensee will be eligible to |
479 | receive Support and Updates and to use the Online Services during the License | 535 | receive Support and Updates and to use the Online Services during the License |
480 | Term, provided, however, that in the event the License Term is longer than 36 | 536 | Term, provided, however, that in the event the License Term is longer than 36 |
481 | months, Support is provided only for the first 12 months, unless the Parties | 537 | months, the initial payment includes Support for only the first 12 months, |
482 | specifically otherwise agree. | 538 | unless the Parties specifically otherwise agree. |
483 | 539 | ||
484 | Unless otherwise decided by The Company at its free and absolute discretion, | 540 | Unless otherwise decided by The Company at its free and absolute discretion, |
485 | Upgrades will not be included in the Support but may be available subject to | 541 | Upgrades will not be included in the Support but may be available subject to |
486 | additional fees. | 542 | additional fees. From time to time The Qt Company may change the Support terms, |
487 | 543 | provided that during the respective ongoing License Term the level of Support | |
488 | From time to time The Qt Company may change the Support terms, provided that | 544 | provided by The Qt Company may not be reduced without the consent of the |
489 | during the respective ongoing License Term the level of Support provided by The | 545 | Licensee. Unless otherwise agreed, The Qt Company shall not be responsible for |
490 | Qt Company may not be reduced without the consent of the Licensee. | 546 | providing any service or support to Customers. |
491 | 547 | ||
492 | Unless otherwise agreed, The Qt Company shall not be responsible for providing | ||
493 | any service or support to Customers. | ||
494 | 548 | ||
495 | 9. CONFIDENTIALITY | 549 | 9. CONFIDENTIALITY |
496 | |||
497 | Each Party acknowledges that during the Term of this Agreement each Party may | 550 | Each Party acknowledges that during the Term of this Agreement each Party may |
498 | receive information about the other Party's business, business methods, | 551 | receive information about the other Party's business, business methods, business |
499 | business plans, customers, business relations, technology, and other | 552 | plans, customers, business relations, technology, and other information, |
500 | information, including the terms of this Agreement, that is confidential and | 553 | including the terms of this Agreement, that is confidential and of great value |
501 | of great value to the other Party, and the value of which would be | 554 | to the other Party, and the value of which would be significantly reduced if |
502 | significantly reduced if disclosed to third parties ("Confidential | 555 | disclosed to third parties (“Confidential Information”). Accordingly, when a |
503 | Information"). Accordingly, when a Party (the "Receiving Party") receives | 556 | Party (the “Receiving Party”) receives Confidential Information from the other |
504 | Confidential Information from the other Party (the "Disclosing Party"), the | 557 | Party (the “Disclosing Party”), the Receiving Party shall only disclose such |
505 | Receiving Party shall only disclose such information to employees and | 558 | information to employees and Contractors on a need to know basis, and shall |
506 | Contractors on a need to know basis, and shall cause its employees and | 559 | cause its employees and employees of its Affiliates to: (i) maintain any and all |
507 | employees of its Affiliates to: (i) maintain any and all Confidential | 560 | Confidential Information in confidence; (ii) not disclose the Confidential |
508 | Information in confidence; (ii) not disclose the Confidential Information to a | 561 | Information to a third party without the Disclosing Party's prior written |
509 | third party without the Disclosing Party's prior written approval; and (iii) | 562 | approval; and (iii) not, directly or indirectly, use the Confidential |
510 | not, directly or indirectly, use the Confidential Information for any purpose | 563 | Information for any purpose other than for exercising its rights and fulfilling |
511 | other than for exercising its rights and fulfilling its responsibilities | 564 | its responsibilities pursuant to this Agreement. Each Party shall take |
512 | pursuant to this Agreement. Each Party shall take reasonable measures to | 565 | reasonable measures to protect the Confidential Information of the other Party, |
513 | protect the Confidential Information of the other Party, which measures shall | 566 | which measures shall not be less than the measures taken by such Party to |
514 | not be less than the measures taken by such Party to protect its own | 567 | protect its own confidential and proprietary information. Obligation of |
515 | confidential and proprietary information. | 568 | confidentiality shall not apply to information that (i) is or becomes generally |
516 | 569 | known to the public through no act or omission of the Receiving Party; (ii) was | |
517 | Obligation of confidentiality shall not apply to information that (i) is or | 570 | in the Receiving Party's lawful possession prior to the disclosure hereunder and |
518 | becomes generally known to the public through no act or omission of the | 571 | was not subject to limitations on disclosure or use; (iii) is developed |
519 | Receiving Party; (ii) was in the Receiving Party's lawful possession prior to | 572 | independently by employees or Contractors of the Receiving Party or other |
520 | the disclosure hereunder and was not subject to limitations on disclosure or | 573 | persons working for the Receiving Party who have not had access to the |
521 | use; (iii) is developed independently by employees or Contractors of the | 574 | Confidential Information of the Disclosing Party, as proven by the written |
522 | Receiving Party or other persons working for the Receiving Party who have not | 575 | records of the Receiving Party; (iv) is lawfully disclosed to the Receiving |
523 | had access to the Confidential Information of the Disclosing Party, as proven | 576 | Party without restrictions, by a third party not under an obligation of |
524 | by the written records of the Receiving Party; (iv) is lawfully disclosed to | 577 | confidentiality; or (v) the Receiving Party is legally compelled to disclose, in |
525 | the Receiving Party without restrictions, by a third party not under an | 578 | which case the Receiving Party shall notify the Disclosing Party of such |
526 | obligation of confidentiality; or (v) the Receiving Party is legally compelled | 579 | compelled disclosure and assert the privileged and confidential nature of the |
527 | to disclose, in which case the Receiving Party shall notify the Disclosing | 580 | information and cooperate fully with the Disclosing Party to limit the scope of |
528 | Party of such compelled disclosure and assert the privileged and confidential | 581 | disclosure and the dissemination of disclosed Confidential Information to the |
529 | nature of the information and cooperate fully with the Disclosing Party to | 582 | minimum extent necessary. |
530 | limit the scope of disclosure and the dissemination of disclosed Confidential | ||
531 | Information to the minimum extent necessary. | ||
532 | 583 | ||
533 | The obligations under this Section 9 shall continue to remain in force for a | 584 | The obligations under this Section 9 shall continue to remain in force for a |
534 | period of five (5) years after the last disclosure, and, with respect to trade | 585 | period of five (5) years after the last disclosure, and, with respect to trade |
535 | secrets, for so long as such trade secrets are protected under applicable trade | 586 | secrets, for so long as such trade secrets are protected under applicable trade |
536 | secret laws. | 587 | secret laws. |
537 | 588 | ||
589 | |||
538 | 10. FEES, DELIVERY AND PAYMENT | 590 | 10. FEES, DELIVERY AND PAYMENT |
539 | 591 | ||
540 | 10.1 License Fees | 592 | 10.1 License Fees |
541 | 593 | License Fees are described in The Qt Company’s standard price list, quote or | |
542 | License Fees are described in The Qt Company's standard price list, quote or | 594 | Purchase Order confirmation or in an appendix hereto, as the case may be. The |
543 | Purchase Order confirmation or in an appendix hereto, as the case may be. | 595 | License Fees shall not be refunded or claimed as a credit in any event or for |
544 | 596 | any reason whatsoever. | |
545 | The License Fees shall not be refunded or claimed as a credit in any event or | ||
546 | for any reason whatsoever. | ||
547 | 597 | ||
548 | 10.2 Ordering Licenses | 598 | 10.2 Ordering Licenses |
549 | 599 | Licensee may purchase Development Licenses and Distribution Licenses pursuant to | |
550 | Licensee may purchase Development Licenses and Distribution Licenses pursuant | 600 | agreed pricing terms or, if no specific pricing terms have been agreed upon, at |
551 | to agreed pricing terms or, if no specific pricing terms have been agreed upon, | 601 | The Qt Company's standard pricing terms applicable at the time of purchase. |
552 | at The Qt Company's standard pricing terms applicable at the time of purchase. | 602 | Unless specifically otherwise provided, any pricing terms referenced in this |
553 | 603 | Agreement shall be valid for twelve (12) months from the date of this Agreement. | |
554 | Licensee shall submit all purchase orders for Development Licenses and | 604 | Licensee shall submit all purchase orders for Development Licenses and |
555 | Distribution Licenses to The Qt Company by email or any other method acceptable | 605 | Distribution Licenses to The Qt Company by email or any other method acceptable |
556 | to The Qt Company (each such order is referred to herein as a "Purchase Order") | 606 | to The Qt Company (each such order is referred to herein as a “Purchase Order”) |
557 | for confirmation, whereupon the Purchase Order shall become binding between the | 607 | for confirmation, whereupon the Purchase Order shall become binding between the |
558 | Parties. | 608 | Parties. |
559 | 609 | ||
560 | 10.3 Distribution License Packs | 610 | 10.3 Distribution License Packs |
561 | |||
562 | Unless otherwise agreed, Distribution Licenses shall be purchased by way of | 611 | Unless otherwise agreed, Distribution Licenses shall be purchased by way of |
563 | Distribution License Packs. | 612 | Distribution License Packs. Upon due payment of the ordered Distribution |
564 | 613 | License Pack(s), the Licensee will have an account of Distribution Licenses | |
565 | Upon due payment of the ordered Distribution License Pack(s), the Licensee will | 614 | available for distributing the Redistributables in accordance with this |
566 | have an account of Distribution Licenses available for installing, bundling or | 615 | Agreement. Each time Licensee distributes a copy of Redistributables, then one |
567 | integrating (all jointly "installing") the Redistributables with the Devices or | 616 | Distribution License is used, and Licensee’s account of available Distribution |
568 | for otherwise distributing the Redistributables in accordance with this | 617 | Licenses is decreased accordingly. Licensee may distribute copies of the |
569 | Agreement. | 618 | Redistributables so long as Licensee has Distribution Licenses remaining on its |
570 | 619 | account. | |
571 | Each time Licensee "installs" or distributes a copy of Redistributables, then | ||
572 | one Distribution License is used, and Licensee's account of available | ||
573 | Distribution Licenses is decreased accordingly. | ||
574 | |||
575 | Licensee may "install" copies of the Redistributables so long as Licensee has | ||
576 | Distribution Licenses remaining on its account. | ||
577 | |||
578 | Redistributables will be deemed to have been "installed" into a Device when one | ||
579 | of the following circumstances shall have occurred: a) the Redistributables | ||
580 | have been loaded onto the Device and used outside of the Licensee's premises or | ||
581 | b) the Device has been fully tested and placed into Licensee's inventory | ||
582 | (or sold) for the first time (i.e., Licensee will not be required to use | ||
583 | (or pay for) more than one Distribution License for each individual Device, | ||
584 | e.g. in a situation where a Device is returned to Licensee's inventory after | ||
585 | delivery to a distributor or sale to a Customer). In addition, if Licensee | ||
586 | includes a back-up copy of the Redistributables on a CD-ROM or other storage | ||
587 | medium along with the product, that backup copy of the Redistributables will | ||
588 | not be deemed to have been "installed" and will not require an additional | ||
589 | Distribution License. | ||
590 | 620 | ||
591 | 10.4 Payment Terms | 621 | 10.4 Payment Terms |
592 | |||
593 | License Fees and any other charges under this Agreement shall be paid by | 622 | License Fees and any other charges under this Agreement shall be paid by |
594 | Licensee no later than thirty (30) days from the date of the applicable invoice | 623 | Licensee no later than thirty (30) days from the date of the applicable invoice |
595 | from The Qt Company. | 624 | from The Qt Company. The Qt Company will submit an invoice to Licensee after |
596 | 625 | the date of this Agreement and/or after The Qt Company receives a Purchase Order | |
597 | The Qt Company will submit an invoice to Licensee after the date of this | 626 | from Licensee. A late payment charge of the lower of (a) one percent per month; |
598 | Agreement and/or after The Qt Company receives a Purchase Order from | 627 | or (b) the interest rate stipulated by applicable law, shall be charged on any |
599 | Licensee. | 628 | unpaid balances that remain past due. |
600 | |||
601 | A late payment charge of the lower of (a) one percent per month; or (b) the | ||
602 | interest rate stipulated by applicable law, shall be charged on any unpaid | ||
603 | balances that remain past due. | ||
604 | |||
605 | The Qt Company shall have the right to suspend, terminate or withhold grants | ||
606 | of all rights to the Licensed Software hereunder, including but not limited to | ||
607 | the Developer License, Distribution License, and Support, should Licensee fail | ||
608 | to make payment in timely fashion. | ||
609 | 629 | ||
610 | 10.5 Taxes | 630 | 10.5 Taxes |
611 | |||
612 | All License Fees and other charges payable hereunder are gross amounts but | 631 | All License Fees and other charges payable hereunder are gross amounts but |
613 | exclusive of any value added tax, use tax, sales tax and other taxes, duties or | 632 | exclusive of any value added tax, use tax, sales tax, withholding tax and other |
614 | tariffs ("Taxes"). Such applicable Taxes shall be paid by Licensee, or, where | 633 | taxes, duties or tariffs (“Taxes”) levied directly for the sale, delivery or use |
615 | applicable, in lieu of payment of such Taxes, Licensee shall provide an | 634 | of Licensed Software hereunder pursuant to any applicable law. Such applicable |
616 | exemption certificate to The Qt Company and any applicable authority. | 635 | Taxes shall be paid by Licensee to The Qt Company, or, where applicable, in lieu |
636 | of payment of such Taxes to The Qt Company, Licensee shall provide an exemption | ||
637 | certificate to The Qt Company and any applicable authority. | ||
617 | 638 | ||
618 | 11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS | 639 | 11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS |
619 | 640 | ||
620 | 11.1 Licensee's Record-keeping | 641 | 11.1 Licensee’s Record-keeping |
621 | 642 | Licensee shall at all times during the Term of this Agreement and for a period | |
622 | Licensee shall at all times maintain accurate and up-to-date written records of | 643 | of seven (7) years thereafter maintain Licensee’s Records in an accurate and |
623 | Licensee's activities related to the use of Licensed Software and distribution | 644 | up-to-date form. Licensee’s Records shall be adequate to reasonably enable The |
624 | of Redistributables. The records shall be adequate to determine Licensee's | 645 | Qt Company to determine Licensee’s compliance with the provisions of this |
625 | compliance with the provisions of this Agreement and to demonstrate the number | 646 | Agreement. The records shall conform to general good accounting practices. |
626 | of Designated Users and Redistributables distributed by Licensee. The records | 647 | Licensee shall, within thirty (30) days from receiving The Qt Company’s request |
627 | shall conform to good accounting practices reasonably acceptable to The Qt | 648 | to that effect, deliver to The Qt Company a report based on Licensee’s Records, |
628 | Company. | 649 | such report to contain information, in sufficient detail, on (i) number and |
629 | 650 | identity of users working with Licensed Software or Open Source Qt, (ii) copies | |
630 | Licensee shall, within thirty (30) days from receiving The Qt Company's request | 651 | of Redistributables distributed by Licensee during the most recent calendar |
631 | to that effect, deliver to The Qt Company a report on Licensee's usage of | 652 | quarter and/or any other term specified by The Qt Company, (iii) number of |
632 | Licensed Software, such report to copies of Redistributables distributed by | 653 | undistributed copies of Redistributables and corresponding number of unused |
633 | Licensee during that calendar quarter, and also detailing the number of | 654 | Distribution Licenses remaining on Licensee’s account, and (iv) any other |
634 | undistributed copies of Redistributables made by Licensee and remaining in its | 655 | information as The Qt Company may reasonably require from time to time. |
635 | account contain information, in sufficient detail, on (i) amount of users | 656 | |
636 | working with Licensed Software, (ii) copies of Redistributables distributed by | 657 | 11.2. The Qt Company’s Audit Rights |
637 | Licensee during that calendar quarter, (iii) number of undistributed copies of | 658 | The Qt Company or an independent auditor acting on behalf of The Qt Company’s, |
638 | Redistributables and corresponding number of unused Distribution Licenses | 659 | may, upon at least five (5) business days’ prior written notice and at its |
639 | remaining on Licensee's account, and (iv) any other information as The Qt | 660 | expense, audit Licensee with respect to the Licensee’s use of the Licensed |
640 | Company may reasonably require from time to time. | 661 | Software, but not more frequently than once during each 6- month period. Such |
641 | 662 | audit may be conducted by mail, electronic means or through an in-person visit | |
642 | 11.2. The Qt Company's Audit Rights | 663 | to Licensee’s place of business. Any such in-person audit shall be conducted |
643 | 664 | during regular business hours at Licensee's facilities and shall not | |
644 | The Qt Company or an independent auditor acting on behalf of The Qt Company's, | 665 | unreasonably interfere with Licensee's business activities. The Qt Company or |
645 | may, upon at least five (5) business days' prior written notice and at its | 666 | the independent auditor acting on behalf of The Qt Company shall be entitled to |
646 | expense, audit Licensee with respect to the use of the Redistributables, but | 667 | inspect Licensee’s Records and conduct necessary interviews of Licensee’s |
647 | not more frequently than once during each 6-month period. Such audit may be | 668 | relevant employees and Contractors. All such Licensee’s Records and use thereof |
648 | conducted by mail, electronic means or through an in-person visit to Licensee's | 669 | shall be subject to an obligation of confidentiality under this Agreement. If |
649 | place of business. Any such in-person audit shall be conducted during regular | 670 | an audit reveals that Licensee is using the Licensed Software beyond scope of |
650 | business hours at Licensee's facilities and shall not unreasonably interfere | 671 | the licenses Licensee has paid for, Licensee agrees to pay The Qt Company any |
651 | with Licensee's business activities. The Qt Company or the independent auditor | 672 | amounts owed for such unauthorized use within 30 days from receipt of the |
652 | acting on behalf of The Qt Company shall be entitled to inspect Licensee's | 673 | corresponding invoice from The Qt Company. In addition, in the event the audit |
653 | Records. All such Licensee's Records and use thereof shall be subject to an | 674 | reveals a material violation of the terms of this Agreement (without limitation, |
654 | obligation of confidentiality under this Agreement. | 675 | either (i) underpayment of more than 10 % of License Fees or 10,000 euros |
655 | 676 | (whichever is more) or (ii) distribution of products, which include or result | |
656 | If an audit reveals that Licensee is using the Licensed Software beyond scope | 677 | from Prohibited Combination, shall be deemed a material violation for purposes |
657 | of the licenses Licensee has paid for, Licensee agrees to immediately pay The | 678 | of this section), then the Licensee shall pay The Qt Company's reasonable cost |
658 | Qt Company any amounts owed for such unauthorized use. | 679 | of conducting such audit. |
659 | |||
660 | In addition, in the event the audit reveals a material violation of the terms | ||
661 | of this Agreement (underpayment of more than 5% of License Fees shall always be | ||
662 | deemed a material violation for purposes of this section), then the Licensee | ||
663 | shall pay The Qt Company's reasonable cost of conducting such audit. | ||
664 | 680 | ||
665 | 12 TERM AND TERMINATION | ||
666 | 681 | ||
667 | 12.1 Term | 682 | 12 TERM AND TERMINATION |
668 | 683 | ||
684 | 12.1 Agreement Term | ||
669 | This Agreement shall enter into force upon due acceptance by both Parties and | 685 | This Agreement shall enter into force upon due acceptance by both Parties and |
670 | remain in force for as long as there is any Development License(s) in force | 686 | remain in force for as long as there is any Development License(s) purchased |
671 | ("Term"), unless and until terminated pursuant to the terms of this Section 12. | 687 | under this Agreement in force (“Term”), unless and until terminated pursuant to |
672 | 688 | the terms of this Section 12. | |
673 | 12.2 Termination by The Qt Company | ||
674 | 689 | ||
675 | The Qt Company shall have the right to terminate this Agreement upon thirty | 690 | 12.2 Termination and suspension of rights |
676 | (30) days prior written notice if the Licensee is in material breach of any | 691 | Either Party shall have the right to terminate this Agreement upon thirty (30) |
692 | days prior written notice if the other Party commits a material breach of any | ||
677 | obligation of this Agreement and fails to remedy such breach within such notice | 693 | obligation of this Agreement and fails to remedy such breach within such notice |
678 | period. | 694 | period. Instead of termination, The Qt Company shall have the right to suspend |
695 | or withhold grants of all rights to the Licensed Software hereunder, including | ||
696 | but not limited to the Development Licenses, Distribution License, and Support, | ||
697 | should Licensee fail to make payment in timely fashion or otherwise violates or | ||
698 | is reasonably suspected to violate its obligations or terms of this Agreement, | ||
699 | and where such violation or breach is not cured within five (5) business days | ||
700 | following The Qt Company’s written notice thereof. | ||
679 | 701 | ||
680 | 12.3 Mutual Right to Terminate | 702 | 12.3 Mutual Right to Terminate |
681 | |||
682 | Either Party shall have the right to terminate this Agreement immediately upon | 703 | Either Party shall have the right to terminate this Agreement immediately upon |
683 | written notice in the event that the other Party becomes insolvent, files for | 704 | written notice in the event that the other Party becomes insolvent, files for |
684 | any form of bankruptcy, makes any assignment for the benefit of creditors, has | 705 | any form of bankruptcy, makes any assignment for the benefit of creditors, has a |
685 | a receiver, administrative receiver or officer appointed over the whole or a | 706 | receiver, administrative receiver or officer appointed over the whole or a |
686 | substantial part of its assets, ceases to conduct business, or an act | 707 | substantial part of its assets, ceases to conduct business, or an act equivalent |
687 | equivalent to any of the above occurs under the laws of the jurisdiction of the | 708 | to any of the above occurs under the laws of the jurisdiction of the other |
688 | other Party. | 709 | Party. |
689 | 710 | ||
690 | 12.4 Parties' Rights and Duties upon Termination | 711 | 12.4 Parties´ Rights and Duties upon Termination |
691 | 712 | Upon expiry or termination of the Agreement Licensee shall cease and shall cause | |
692 | Upon expiry or termination of the Agreement Licensee shall cease and shall | 713 | all Designated Users (including those of its Affiliates’ and Contractors’) to |
693 | cause all Designated Users (including those of its Affiliates' and | 714 | cease using the Licensed Software and distribution of the Redistributables under |
694 | Contractors') to cease using the Licensed Software and distribution of the | 715 | this Agreement. Notwithstanding the above, in the event the Agreement expires |
695 | Redistributables under this Agreement. | 716 | or is terminated: |
696 | 717 | (i) as a result of The Qt Company choosing not to renew the Development | |
697 | Notwithstanding the above, in the event the Agreement expires or is terminated: | 718 | License(s) as set forth in Section 3.1, then all valid licenses |
698 | 719 | possessed by the Licensee at such date shall be extended to be valid | |
699 | (i) as a result of The Qt Company choosing not to renew the Development | 720 | in perpetuity under the terms of this Agreement and Licensee is |
700 | License(s) as set forth in Section 3.1, then all valid licenses possessed by | 721 | entitled to purchase additional licenses as set forth in Section |
701 | the Licensee at such date shall be extended to be valid in perpetuity under the | 722 | 10.2; or |
702 | terms of this Agreement and Licensee is entitled to purchase additional | 723 | (ii) for reason other than by The Qt Company pursuant to item (i) above or |
703 | licenses as set forth in Section 10.2; or | 724 | pursuant to Section 12.2, then the Licensee is entitled, for a period |
704 | 725 | of six (6) months after the effective date of termination, to continue | |
705 | (ii) for reason other than by The Qt Company pursuant to item (i) above or | 726 | distribution of Devices under the Distribution Licenses paid but |
706 | pursuant to Section 12.2, then the Licensee is entitled, for a period of six | 727 | unused at such effective date of termination. |
707 | (6) months after the effective date of termination, to continue distribution of | 728 | |
708 | Devices under the Distribution Licenses paid but unused at such effective date | 729 | Upon any such termination the Licensee shall destroy or return to The Qt Company |
709 | of termination. | 730 | all copies of the Licensed Software and all related materials and will certify |
710 | 731 | the same to The Qt Company upon its request, provided however that Licensee may | |
711 | Upon any such termination the Licensee shall destroy or return to The Qt | 732 | retain and exploit such copies of the Licensed Software as it may reasonably |
712 | Company all copies of the Licensed Software and all related materials and will | 733 | require in providing continued support to Customers. Expiry or termination of |
713 | certify the same to The Qt Company upon its request, provided however that | 734 | this Agreement for any reason whatsoever shall not relieve Licensee of its |
714 | Licensee may retain and exploit such copies of the Licensed Software as it may | 735 | obligation to pay any License Fees accrued or payable to The Qt Company prior to |
715 | reasonably require in providing continued support to Customers. | 736 | the effective date of termination, and Licensee shall immediately pay to The Qt |
716 | 737 | Company all such fees upon the effective date of termination. Termination of | |
717 | Expiry or termination of this Agreement for any reason whatsoever shall not | 738 | this Agreement shall not affect any rights of Customers to continue use of |
718 | relieve Licensee of its obligation to pay any License Fees accrued or payable | 739 | Applications and Devices (and therein incorporated Redistributables). |
719 | to The Qt Company prior to the effective date of termination, and Licensee | ||
720 | shall immediately pay to The Qt Company all such fees upon the effective date | ||
721 | of termination. Termination of this Agreement shall not affect any rights of | ||
722 | Customers to continue use of Applications and Devices (and therein incorporated | ||
723 | Redistributables). | ||
724 | 740 | ||
725 | 12.5 Extension in case of bankruptcy | 741 | 12.5 Extension in case of bankruptcy |
726 | |||
727 | In the event The Qt Company is declared bankrupt under a final, non-cancellable | 742 | In the event The Qt Company is declared bankrupt under a final, non-cancellable |
728 | decision by relevant court of law, and this Agreement is not, at the date of | 743 | decision by relevant court of law, and this Agreement is not, at the date of |
729 | expiry of the Development License(s) pursuant to Section 3.1, assigned to | 744 | expiry of the Development License(s) pursuant to Section 3.1, assigned to party, |
730 | party, who has assumed The Qt Company's position as a legitimate licensor of | 745 | who has assumed The Qt Company’s position as a legitimate licensor of Licensed |
731 | Licensed Software under this Agreement, then all valid licenses possessed by | 746 | Software under this Agreement, then all valid licenses possessed by the Licensee |
732 | the Licensee at such date of expiry, and which the Licensee has not notified | 747 | at such date of expiry, and which the Licensee has not notified for expiry, |
733 | for expiry, shall be extended to be valid in perpetuity under the terms of | 748 | shall be extended to be valid in perpetuity under the terms of this Agreement. |
734 | this Agreement. | ||
735 | 749 | ||
736 | 13. GOVERNING LAW AND LEGAL VENUE | ||
737 | 750 | ||
751 | 13. GOVERNING LAW AND LEGAL VENUE | ||
738 | In the event this Agreement is in the name of The Qt Company Inc., a Delaware | 752 | In the event this Agreement is in the name of The Qt Company Inc., a Delaware |
739 | Corporation, then: | 753 | Corporation, then: |
740 | 754 | (i) this Agreement shall be construed and interpreted in accordance with | |
741 | (i) this Agreement shall be construed and interpreted in accordance with the | 755 | the laws of the State of California, USA, excluding its choice of law |
742 | laws of the State of California, USA, excluding its choice of law provisions; | 756 | provisions; |
743 | 757 | (ii) the United Nations Convention on Contracts for the International Sale | |
744 | (ii) the United Nations Convention on Contracts for the International Sale of | 758 | of Goods will not apply to this Agreement; and |
745 | Goods will not apply to this Agreement; and | 759 | (iii) any dispute, claim or controversy arising out of or relating to this |
746 | 760 | Agreement or the breach, termination, enforcement, interpretation or | |
747 | (iii) any dispute, claim or controversy arising out of or relating to this | 761 | validity thereof, including the determination of the scope or |
748 | Agreement or the breach, termination, enforcement, interpretation or validity | 762 | applicability of this Agreement to arbitrate, shall be determined by |
749 | thereof, including the determination of the scope or applicability of this | 763 | arbitration in San Francisco, USA, before one arbitrator. The |
750 | Agreement to arbitrate, shall be determined by arbitration in San Francisco, | 764 | arbitration shall be administered by JAMS pursuant to JAMS' |
751 | USA, before one arbitrator. The arbitration shall be administered by JAMS | 765 | Streamlined Arbitration Rules and Procedures. Judgment on the Award |
752 | pursuant to JAMS' Streamlined Arbitration Rules and Procedures. Judgment on the | 766 | may be entered in any court having jurisdiction. This Section shall |
753 | Award may be entered in any court having jurisdiction. This Section shall not | 767 | not preclude parties from seeking provisional remedies in aid of |
754 | preclude parties from seeking provisional remedies in aid of arbitration from a | 768 | arbitration from a court of appropriate jurisdiction. |
755 | court of appropriate jurisdiction. | ||
756 | 769 | ||
757 | In the event this Agreement is in the name of The Qt Company Ltd., a Finnish | 770 | In the event this Agreement is in the name of The Qt Company Ltd., a Finnish |
758 | Company, then: | 771 | Company, then: |
772 | (i) this Agreement shall be construed and interpreted in accordance with | ||
773 | the laws of Finland, excluding its choice of law provisions; | ||
774 | (ii) the United Nations Convention on Contracts for the International Sale | ||
775 | of Goods will not apply to this Agreement; and | ||
776 | (iii) any disputes, controversy or claim arising out of or relating to this | ||
777 | Agreement, or the breach, termination or validity thereof shall be | ||
778 | finally settled by arbitration in accordance with the Arbitration | ||
779 | Rules of Finland Chamber of Commerce. The arbitration tribunal shall | ||
780 | consist of one (1), or if either Party so requires, of three (3), | ||
781 | arbitrators. The award shall be final and binding and enforceable in | ||
782 | any court of competent jurisdiction. The arbitration shall be held in | ||
783 | Helsinki, Finland and the process shall be conducted in the English | ||
784 | language. This Section shall not preclude parties from seeking | ||
785 | provisional remedies in aid of arbitration from a court of | ||
786 | appropriate jurisdiction. | ||
759 | 787 | ||
760 | (i) this Agreement shall be construed and interpreted in accordance with the | ||
761 | laws of Finland, excluding its choice of law provisions; | ||
762 | |||
763 | (ii) the United Nations Convention on Contracts for the International Sale of | ||
764 | Goods will not apply to this Agreement; and | ||
765 | |||
766 | (iii) any disputes, controversy or claim arising out of or relating to this | ||
767 | Agreement, or the breach, termination or validity thereof shall be shall be | ||
768 | finally settled by arbitration in accordance with the Arbitration Rules of | ||
769 | Finland Chamber of Commerce. The arbitration tribunal shall consist of one (1), | ||
770 | or if either Party so requires, of three (3), arbitrators. The award shall be | ||
771 | final and binding and enforceable in any court of competent jurisdiction. The | ||
772 | arbitration shall be held in Helsinki, Finland and the process shall be | ||
773 | conducted in the English language. This Section shall not preclude parties from | ||
774 | seeking provisional remedies in aid of arbitration from a court of appropriate | ||
775 | jurisdiction. | ||
776 | 788 | ||
777 | 14. GENERAL PROVISIONS | 789 | 14. GENERAL PROVISIONS |
778 | 790 | ||
779 | 14.1 No Assignment | 791 | 14.1 No Assignment |
780 | |||
781 | Except in the case of a merger or sale of substantially all of its corporate | 792 | Except in the case of a merger or sale of substantially all of its corporate |
782 | assets, Licensee shall not be entitled to assign or transfer all or any of its | 793 | assets, Licensee shall not be entitled to assign or transfer all or any of its |
783 | rights, benefits and obligations under this Agreement without the prior written | 794 | rights, benefits and obligations under this Agreement without the prior written |
784 | consent of The Qt Company, which shall not be unreasonably withheld or delayed. | 795 | consent of The Qt Company, which shall not be unreasonably withheld or delayed. |
785 | The Qt Company shall be entitled to freely assign or transfer any of its | 796 | The Qt Company shall be entitled to freely assign or transfer any of its rights, |
786 | rights, benefits or obligations under this Agreement. | 797 | benefits or obligations under this Agreement. 14.2 No Third Party |
787 | 798 | Representations Licensee shall make no representations or warranties concerning | |
788 | 14.2 No Third Party Representations | 799 | the Licensed Software on behalf of The Qt Company. Any representation or |
789 | 800 | warranty Licensee makes or purports to make on The Qt Company’s behalf shall be | |
790 | Licensee shall make no representations or warranties concerning the Licensed | 801 | void as to The Qt Company. 14.3 Surviving Sections Any terms and conditions |
791 | Software on behalf of The Qt Company. Any representation or warranty Licensee | 802 | that by their nature or otherwise reasonably should survive termination of this |
792 | makes or purports to make on The Qt Company's behalf shall be void as to The | 803 | Agreement shall so be deemed to survive. Such sections include especially the |
793 | Qt Company. | 804 | following: 1, 2, 6, 7, 9, 11, 12.4, 13 and 14. |
794 | |||
795 | 14.3 Surviving Sections | ||
796 | |||
797 | Any terms and conditions that by their nature or otherwise reasonably should | ||
798 | survive termination of this Agreement shall so be deemed to survive. | ||
799 | 805 | ||
800 | 14.4 Entire Agreement | 806 | 14.4 Entire Agreement |
801 | |||
802 | This Agreement, the exhibits hereto, the License Certificate and any applicable | 807 | This Agreement, the exhibits hereto, the License Certificate and any applicable |
803 | Purchase Order constitute the complete agreement between the Parties and | 808 | Purchase Order accepted by The Qt Company constitute the complete agreement |
804 | supersedes all prior or contemporaneous discussions, representations, and | 809 | between the Parties and supersedes all prior or contemporaneous discussions, |
805 | proposals, written or oral, with respect to the subject matters discussed | 810 | representations, and proposals, written or oral, with respect to the subject |
806 | herein. | 811 | matters discussed herein. In the event of any conflict or inconsistency between |
807 | 812 | this Agreement and any Purchase Order, the terms of this Agreement will prevail | |
808 | In the event of any conflict or inconsistency between this Agreement and any | 813 | over the terms of the Purchase Order with respect to such conflict or |
809 | Purchase Order, the terms of this Agreement will prevail over the terms of the | 814 | inconsistency. Parties specifically acknowledge and agree that this Agreement |
810 | Purchase Order with respect to such conflict or inconsistency. | 815 | prevails over any click-to-accept or similar agreements the Designated Users may |
811 | 816 | need to accept online upon download of the Licensed Software, as may be required | |
812 | Parties specifically acknowledge and agree that this Agreement prevails over | 817 | by The Qt Company’s applicable processes relating to Licensed Software. |
813 | any click-to-accept or similar agreements the Designated Users may need to | ||
814 | accept online upon download of the Licensed Software, as may be required by | ||
815 | The Qt Company's applicable processes relating to Licensed Software. | ||
816 | 818 | ||
817 | 14.5 Modifications | 819 | 14.5 Modifications |
818 | |||
819 | No modification of this Agreement shall be effective unless contained in a | 820 | No modification of this Agreement shall be effective unless contained in a |
820 | writing executed by an authorized representative of each Party. No term or | 821 | writing executed by an authorized representative of each Party. No term or |
821 | condition contained in Licensee's Purchase Order shall apply unless expressly | 822 | condition contained in Licensee's Purchase Order (“Deviating Terms”) shall apply |
822 | accepted by The Qt Company in writing. | 823 | unless The Qt Company has expressly agreed such Deviating Terms in writing. |
824 | Unless and to the extent expressly agreed by The Qt Company, any such Deviating | ||
825 | Terms shall be deemed void and with no legal effect. For clarity, delivery of | ||
826 | the Licensed Software following the receipt of the Purchase Order including | ||
827 | Deviating Terms shall not constitute acceptance of such Deviating Terms.” | ||
823 | 828 | ||
824 | 14.6 Force Majeure | 829 | 14.6 Force Majeure |
825 | |||
826 | Except for the payment obligations hereunder, neither Party shall be liable to | 830 | Except for the payment obligations hereunder, neither Party shall be liable to |
827 | the other for any delay or non-performance of its obligations hereunder in the | 831 | the other for any delay or non-performance of its obligations hereunder in the |
828 | event and to the extent that such delay or non-performance is due to an event | 832 | event and to the extent that such delay or non-performance is due to an event of |
829 | of act of God, terrorist attack or other similar unforeseeable catastrophic | 833 | act of God, terrorist attack or other similar unforeseeable catastrophic event |
830 | event that prevents either Party for fulfilling its obligations under this | 834 | that prevents either Party for fulfilling its obligations under this Agreement |
831 | Agreement and which such Party cannot avoid or circumvent ("Force Majeure | 835 | and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the |
832 | Event"). If the Force Majeure Event results in a delay or non-performance of a | 836 | Force Majeure Event results in a delay or non-performance of a Party for a |
833 | Party for a period of three (3) months or longer, then either Party shall have | 837 | period of three (3) months or longer, then either Party shall have the right to |
834 | the right to terminate this Agreement with immediate effect without any | 838 | terminate this Agreement with immediate effect without any liability (except for |
835 | liability (except for the obligations of payment arising prior to the event of | 839 | the obligations of payment arising prior to the event of Force Majeure) towards |
836 | Force Majeure) towards the other Party. | 840 | the other Party. |
837 | 841 | ||
838 | 14.7 Notices | 842 | 14.7 Notices |
839 | |||
840 | Any notice given by one Party to the other shall be deemed properly given and | 843 | Any notice given by one Party to the other shall be deemed properly given and |
841 | deemed received if specifically acknowledged by the receiving Party in writing | 844 | deemed received if specifically acknowledged by the receiving Party in writing |
842 | or when successfully delivered to the recipient by hand, fax, or special | 845 | or when successfully delivered to the recipient by hand, fax, or special courier |
843 | courier during normal business hours on a business day to the addresses | 846 | during normal business hours on a business day to the addresses specified for |
844 | specified for each Party on the signature page. Each communication and document | 847 | each Party on the signature page. Each communication and document made or |
845 | made or delivered by one Party to the other Party pursuant to this Agreement | 848 | delivered by one Party to the other Party pursuant to this Agreement shall be in |
846 | shall be in the English language. | 849 | the English language. |
847 | 850 | ||
848 | 14.8 Export Control | 851 | 14.8 Export Control |
849 | 852 | Licensee acknowledges that the Redistributables, as incorporated in Applications | |
850 | Licensee acknowledges that the Redistributables may be subject to export | 853 | or Devices, may be subject to export control restrictions under the applicable |
851 | control restrictions under the applicable laws of respective countries. | 854 | laws of respective countries. Licensee shall fully comply with all applicable |
852 | Licensee shall fully comply with all applicable export license restrictions | 855 | export license restrictions and requirements as well as with all laws and |
853 | and requirements as well as with all laws and regulations relating to the | 856 | regulations relating to the Redistributables and exercise of licenses hereunder |
854 | Redistributables and exercise of licenses hereunder and shall procure all | 857 | and shall procure all necessary governmental authorizations, including without |
855 | necessary governmental authorizations, including without limitation, all | 858 | limitation, all necessary licenses, approvals, permissions or consents, where |
856 | necessary licenses, approvals, permissions or consents, where necessary for the | 859 | necessary for the re-exportation of the Redistributables, Applications and/or |
857 | re-exportation of the Redistributables, Applications and/or Devices. | 860 | Devices. |
858 | 861 | ||
859 | 14.9 No Implied License | 862 | 14.9 No Implied License |
860 | |||
861 | There are no implied licenses or other implied rights granted under this | 863 | There are no implied licenses or other implied rights granted under this |
862 | Agreement, and all rights, save for those expressly granted hereunder, shall | 864 | Agreement, and all rights, save for those expressly granted hereunder, shall |
863 | remain with The Qt Company and its licensors. In addition, no licenses or | 865 | remain with The Qt Company and its licensors. In addition, no licenses or |
@@ -865,11 +867,23 @@ immunities are granted to the combination of the Licensed Software with any | |||
865 | other software or hardware not delivered by The Qt Company under this Agreement. | 867 | other software or hardware not delivered by The Qt Company under this Agreement. |
866 | 868 | ||
867 | 14.10 Attorney Fees | 869 | 14.10 Attorney Fees |
868 | |||
869 | The prevailing Party in any action to enforce this Agreement shall be entitled | 870 | The prevailing Party in any action to enforce this Agreement shall be entitled |
870 | to recover its attorney's fees and costs in connection with such action. | 871 | to recover its attorney’s fees and costs in connection with such action. |
871 | 872 | ||
872 | 14.11 Severability | 873 | 14.11 Privacy |
874 | Licensee acknowledges and agrees that for the purpose of this Agreement, The Qt | ||
875 | Company may collect, use, transfer and disclose personal data pertaining to | ||
876 | Designated Users as well as any other employees and directors of the Licensee | ||
877 | and its Contractors relevant for carrying out the intent of this Agreement. Such | ||
878 | personal data may be collected from the Licensee or directly from the relevant | ||
879 | individuals. The Parties acknowledge that with regard to such personal data | ||
880 | processed hereunder, The Qt Company shall be regarded as the Data Controller | ||
881 | under the applicable Data Protection Legislation. The Qt Company shall process | ||
882 | any such personal data in accordance with its privacy policies and practices, | ||
883 | which will comply with all applicable requirements of the Data Protection | ||
884 | Legislation. | ||
885 | |||
886 | 14.12 Severability | ||
873 | 887 | ||
874 | If any provision of this Agreement shall be adjudged by any court of competent | 888 | If any provision of this Agreement shall be adjudged by any court of competent |
875 | jurisdiction to be unenforceable or invalid, that provision shall be limited or | 889 | jurisdiction to be unenforceable or invalid, that provision shall be limited or |
@@ -877,37 +891,395 @@ eliminated to the minimum extent necessary so that this Agreement shall | |||
877 | otherwise remain in full force and effect and enforceable. | 891 | otherwise remain in full force and effect and enforceable. |
878 | 892 | ||
879 | 893 | ||
880 | IN WITNESS WHEREOF, the Parties hereto, intending to be legally bound hereby, | 894 | APPENDICES |
881 | have caused this Agreement to be executed by Licensee's authorized | 895 | |
882 | representative installing the Licensed Software and accepting the terms | 896 | This Agreement includes Appendix 1 or/and Appendix 8, and possibly one or more |
883 | hereof in connection therewith. | 897 | of the appendices 3-5, depending on the product(s) purchased by the Licensee, |
884 | 898 | what is stated in the quote or invoice, and/or what is stated in the Licensee’s | |
885 | 899 | License Certificate. | |
886 | Appendix 1 | 900 | |
887 | 901 | ||
888 | 1. Parts of the Licensed Software that are permitted for distribution in | 902 | APPENDIX 1: LICENSED SOFTWARE |
889 | object code form only ("Redistributables") under this Agreement: | 903 | |
890 | 904 | 1a. Licensed Software - Qt Toolkit | |
891 | - The Licensed Software's Qt Essentials and Qt Add-on libraries | 905 | |
892 | - The Licensed Software's configuration tool ("qtconfig") | 906 | Module Description |
893 | - The Licensed Software's help tool ("Qt Assistant") | 907 | Qt Core Core non-graphical classes used by other modules. |
894 | - The Licensed Software's internationalization tools ("Qt Linguist", "lupdate", | 908 | Qt GUI Base classes for graphical user interface (GUI) |
895 | "lrelease") | 909 | components. |
896 | - The Licensed Software's QML ("Qt Quick") launcher tool ("qmlscene" or | 910 | Qt Multimedia Classes for audio, video and camera functionality. |
897 | "qmlviewer") | 911 | Qt Multimedia Widgets Widget-based classes for implementing multimedia |
898 | - The Licensed Software's installer framework | 912 | functionality. |
899 | 913 | Qt Network Classes to make network programming easier and more | |
900 | 2. Parts of the Licensed Software that are not permitted for distribution | 914 | portable. |
901 | include, but are not limited to: | 915 | Qt QML Classes for QML and JavaScript languages. |
902 | 916 | Qt Quick A declarative framework for building highly dynamic | |
903 | - The Licensed Software's source code and header files | 917 | applications with custom user interfaces. |
904 | - The Licensed Software's documentation | 918 | Qt Quick Controls 2 Provides lightweight QML types for creating |
905 | - The Licensed Software's documentation generation tool ("qdoc") | 919 | performant user interfaces for desktop, embedded, |
906 | - The Licensed Software's tool for writing makefiles ("qmake") | 920 | and mobile devices. |
907 | - The Licensed Software's Meta Object Compiler ("moc") | 921 | Qt Quick Dialogs Types for creating and interacting with system |
908 | - The Licensed Software's User Interface Compiler ("uic") | 922 | dialogs from a Qt Quick application. |
909 | - The Licensed Software's Resource Compiler ("rcc") | 923 | Qt Quick Layouts Layouts are items that are used to arrange Qt Quick |
910 | - The Licensed Software's parts of the IDE tool ("Qt Creator") | 924 | 2 based items in the user interface. |
911 | - The Licensed Software's parts of the Design tools ("Qt 3D Studio" or | 925 | Qt Quick Test A unit test framework for QML applications. |
912 | "Qt Quick Designer") | 926 | Qt SQL Classes for database integration using SQL. |
913 | - The Licensed Software's Emulator | 927 | Qt Test Classes for unit testing Qt applications and |
928 | libraries. | ||
929 | Qt Widgets Classes to extend Qt GUI with C++ widgets. | ||
930 | Active Qt Classes for applications which use ActiveX and COM | ||
931 | Qt 3D Functionality for near-realtime simulation systems | ||
932 | with support for 2D and 3D rendering. | ||
933 | Qt Android Extras Provides platform-specific APIs for Android. | ||
934 | Qt Bluetooth Provides access to Bluetooth hardware. | ||
935 | Qt Canvas 3D Enables OpenGL-like 3D drawing calls from Qt Quick | ||
936 | applications using JavaScript. | ||
937 | Qt Concurrent Classes for writing multi-threaded programs without | ||
938 | using low-level threading primitives. | ||
939 | Qt D-Bus Classes for inter-process communication over the | ||
940 | D-Bus protocol. | ||
941 | Qt Gamepad Enables Qt applications to support the use of gamepad | ||
942 | hardware. | ||
943 | Qt Graphical Effects Graphical effects for use with Qt Quick 2. | ||
944 | Qt Help Classes for integrating documentation into | ||
945 | applications, similar to Qt Assistant. | ||
946 | Qt Image Formats Plugins for additional image formats: TIFF, | ||
947 | MNG, TGA, WBMP. | ||
948 | Qt Location Displays map, navigation, and place content in a QML | ||
949 | application. | ||
950 | Qt Mac Extras Provides platform-specific APIs for macOS. | ||
951 | Qt Network Authorization Provides support for OAuth-based authorization to | ||
952 | online services. | ||
953 | Qt NFC Provides access to Near-Field communication (NFC) | ||
954 | hardware. | ||
955 | Qt Platform Headers Provides classes that encapsulate platform-specific | ||
956 | information. | ||
957 | Qt Positioning Provides access to position, satellite and area | ||
958 | monitoring classes. | ||
959 | Qt Print Support Classes to make printing easier and more portable. | ||
960 | Qt Purchasing Enables in-app purchase of products in Qt | ||
961 | applications. | ||
962 | Qt for Python Python bindings for Qt. | ||
963 | Qt Quick Controls Reusable Qt Quick based UI controls to create | ||
964 | classic desktop-style user interfaces. | ||
965 | Qt Quick Extras Provides a specialized set of controls that can | ||
966 | be used to build interfaces in Qt Quick. | ||
967 | Qt Quick Widgets Provides a C++ widget class for displaying a Qt | ||
968 | Quick user interface. | ||
969 | Qt SCXML Provides classes and tools for creating state | ||
970 | machines from SCXML files. | ||
971 | Qt Sensors Provides access to sensor hardware and motion | ||
972 | gesture recognition. | ||
973 | Qt Serial Bus Provides access to serial industrial bus interface. | ||
974 | Qt Serial Port Provides access to hardware and virtual serial ports. | ||
975 | Qt Speech Provides support for accessibility features such as | ||
976 | text-to-speech. | ||
977 | Qt SVG Classes for displaying the contents of SVG files. | ||
978 | Qt UI Tools Classes for loading QWidget based forms created in | ||
979 | Qt Designer dynamically, at runtime. | ||
980 | Qt WebChannel Provides access to QObject or QML objects from HTML | ||
981 | clients for seamless integration of Qt applications | ||
982 | with HTML/JavaScript clients. | ||
983 | Qt WebEngine Classes and functions for embedding web content in | ||
984 | applications using the Chromium browser project. | ||
985 | Qt WebSockets Provides WebSocket communication. | ||
986 | Qt WebView Displays web content in a QML application by using | ||
987 | APIs native to the platform. | ||
988 | Qt Windows Extras Provides platform-specific APIs for Windows. | ||
989 | Qt X11 Extras Provides platform-specific APIs for X11. | ||
990 | Qt XML C++ implementations of SAX and DOM. | ||
991 | Qt XML Patterns Support for XPath, XQuery, XSLT and XML schema | ||
992 | validation. | ||
993 | Qt Wayland Compositor Provides a framework to develop a Wayland compositor. | ||
994 | Qt Charts UI Components for displaying charts. | ||
995 | Qt Data Visualization UI Components for creating 3D data visualizations. | ||
996 | Qt Virtual Keyboard A framework for implementing different input methods | ||
997 | as well as a QML virtual keyboard. | ||
998 | |||
999 | |||
1000 | 1b. Licenses software – Embedded software development libraries | ||
1001 | |||
1002 | Module Description | ||
1003 | Boot 2 Qt stack Yocto based Embedded Linux stack for selected | ||
1004 | target hardware. | ||
1005 | Qt OTA Client-side capability for device image updates Over | ||
1006 | The Air. | ||
1007 | Device Utilities Collection of API’s to manage the device; E.g. | ||
1008 | display, WiFi and Bluetooth settings. | ||
1009 | Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging, | ||
1010 | profiling and other features over USB. Up to developer | ||
1011 | to decide if this is left in the final solution. | ||
1012 | |||
1013 | |||
1014 | 1c. Licensed Software - Qt Tools/Applications | ||
1015 | |||
1016 | Tool Description | ||
1017 | Qt Creator The integrated development environment for Qt. | ||
1018 | Qt Designer Qt tool for designing and building graphical user | ||
1019 | interfaces. | ||
1020 | Qt Linguist Tool used to add translations to Qt applications. | ||
1021 | Qt Assistant Tool for viewing online documentation in Qt | ||
1022 | help-file format. | ||
1023 | Qmake Utility tool used to automate the generation of make | ||
1024 | files. | ||
1025 | uic User interface compiler for the Qt GUI toolkit. | ||
1026 | rcc Resource compiler used for embedding resources into | ||
1027 | Qt applications. | ||
1028 | lupdate Tool that finds the translatable strings in the | ||
1029 | specified source, header and Qt Designer interface | ||
1030 | files, and produces or updates translation files. | ||
1031 | lrelease Tool that produces translation files in the compact | ||
1032 | binary format used by localized Qt applications. | ||
1033 | qlalr Qt parser generator tool. | ||
1034 | qdoc Configurable documentation generation tool. | ||
1035 | qmlscene QML launcher tool. | ||
1036 | qmlviewer QML launcher tool. | ||
1037 | |||
1038 | |||
1039 | 1d. Licenses software –Qt Tools/Applications specific to embedded software | ||
1040 | development | ||
1041 | |||
1042 | Tool Description | ||
1043 | Target toolchains Cross compilation toolchains for supported target | ||
1044 | devices and operating systems. | ||
1045 | Qt Debugging Bridge (QDB) Enables deployment, debugging, profiling and other | ||
1046 | Host Tools features over USB from development host PC to target | ||
1047 | device. | ||
1048 | qtconfig-gui Qt Lite Configurator tool graphical interface. | ||
1049 | Qt Emulator Qt Emulator | ||
1050 | |||
1051 | |||
1052 | 2. Parts of the Licensed Software that are permitted for distribution in | ||
1053 | object-code form only (“Redistributables”) under this Agreement: | ||
1054 | |||
1055 | 2a. Qt for Application Development | ||
1056 | |||
1057 | - The Licensed Software's Qt Toolkit libraries defined in 1a | ||
1058 | - The Licensed Software's installer framework | ||
1059 | |||
1060 | 2b. Qt for Device Creation | ||
1061 | |||
1062 | - Qt for Application Development Redistributables defined in 2a | ||
1063 | - The Licensed Software’s Embedded software development libraries defined | ||
1064 | in 1b | ||
1065 | |||
1066 | 2c. Qt 3D Studio | ||
1067 | |||
1068 | - The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”) | ||
1069 | |||
1070 | |||
1071 | APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE | ||
1072 | |||
1073 | 1. Licensed Software | ||
1074 | |||
1075 | In addition to what is provided under the definition of the Licensed Software, | ||
1076 | Parties agree that Licensed Software shall also include the following additional | ||
1077 | software products of The Qt Company if included in the quote / invoice: | ||
1078 | |||
1079 | Additional software product Description | ||
1080 | Qt for Automation A collection of software components and | ||
1081 | libraries targeted for the development of | ||
1082 | automation systems. | ||
1083 | Qt Safe Renderer Provides a UI rendering component that can be | ||
1084 | used to render safety- critical items as well | ||
1085 | as documentation and certification artifacts. | ||
1086 | Qt Application Manager Daemon, that helps to create embedded Linux | ||
1087 | systems that have a highly complex UI setup. | ||
1088 | GammaRay A software introspection tool for Qt | ||
1089 | applications. | ||
1090 | |||
1091 | |||
1092 | 2. Parts of the Licensed Software that are permitted for distribution in | ||
1093 | object-code form only (“Redistributables”) under this Agreement: | ||
1094 | |||
1095 | - Qt for Automation The Licensed Software’s Qt for Automation | ||
1096 | libraries defined in 1 | ||
1097 | - Qt Safe Renderer The Licensed Software’s Qt Safe Renderer | ||
1098 | libraries defined in 1 | ||
1099 | - Qt Application Manager The Licensed Software’s Qt Application Manager | ||
1100 | libraries defined in 1 | ||
1101 | |||
1102 | All the above is considered as Redistributables and subject to applicable | ||
1103 | provisions and limitations including but not limited to what is defined in | ||
1104 | section 3. | ||
1105 | |||
1106 | |||
1107 | APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX | ||
1108 | |||
1109 | The provisions of this Appendix 4 are applicable for Start-up Companies and for | ||
1110 | the Evaluation Term. | ||
1111 | |||
1112 | For the purpose of this Appendix 4, the following additional definitions shall | ||
1113 | be applicable: | ||
1114 | “Trial Term” shall mean a period of twelve (12) months. | ||
1115 | |||
1116 | “Start-up Company” means a company with a maximum annual revenue, including | ||
1117 | funding, equivalent to 100,000 USD (in applicable currency) during a respective | ||
1118 | calendar year, as evidenced by duly audited records of the Licensee and approved | ||
1119 | by The Qt Company. | ||
1120 | |||
1121 | During the Trial Term, Section 3 shall apply with following modifications | ||
1122 | (“Trial Term Modifications”): | ||
1123 | |||
1124 | - Licenses granted under Sections 3.1 and 3.2 shall be free of any charge. | ||
1125 | For clarity, License for distribution of Devices pursuant to Section 3.3 is | ||
1126 | subject to applicable License Fee for necessary Distribution Licenses; | ||
1127 | - Development License under Section 3.1 is limited to a maximum of three (3) | ||
1128 | Designated Users; and | ||
1129 | - Support is available subject to availability, as judged by The Qt Company | ||
1130 | at its free and absolute discretion, provided that support will be limited | ||
1131 | to a maximum of ten (10) tickets during the Trial Term. | ||
1132 | |||
1133 | Upon expiry of the Trial Term: | ||
1134 | |||
1135 | a) This Appendix 4 is terminated, Trial Term Modifications cease to remain in | ||
1136 | force, Licensee’s Development Licenses shall be automatically converted | ||
1137 | into licenses subject to a License Fee (in the amount specified in the | ||
1138 | quote or in Appendix 2 and payable with a 30-day payment term) and | ||
1139 | Licensee’s rights and obligations under this Agreement shall continue to | ||
1140 | remain in force under the standard provisions of the Agreement, unless the | ||
1141 | Licensee notifies The Qt Company in writing no less than ninety (90) days | ||
1142 | before such expiry date that Licensee does not agree to such continuance, | ||
1143 | in which event the Agreement, and all rights of the Licensee thereunder, | ||
1144 | shall expire; provided however that | ||
1145 | b) in the event the Licensee still qualifies as a Start-up Company, the | ||
1146 | Licensee has an option (“Option”), instead of what is stated in item a) | ||
1147 | above, to extend the Trial Term renewal is limited to one time and total | ||
1148 | duration of Trial Terms thus to 24 months after the effective date. | ||
1149 | Licensee shall notify The Qt Company in writing no less than ninety (90) | ||
1150 | days before the expiry date, if Licensee wish to exercise the Option. | ||
1151 | |||
1152 | |||
1153 | APPENDIX 5: NON-COMMERCIAL USE APPENDIX | ||
1154 | |||
1155 | The provisions of this Appendix 5 are applicable for non-commercial use of the | ||
1156 | Licensed Software by the Licensee. For the purpose of this Appendix 5, the | ||
1157 | following additional definitions (replacing the relevant definition of the | ||
1158 | Agreement, where applicable) shall be applicable: | ||
1159 | |||
1160 | “Demo Units” shall mean | ||
1161 | (i) hardware development platform, which incorporates the Licensed | ||
1162 | Software along with Licensee’s software and/or hardware, and | ||
1163 | (ii) prototype versions of Applications or Devices. | ||
1164 | |||
1165 | “Designated User(s)” shall mean the employees and students of the Licensee. | ||
1166 | |||
1167 | “Licensee Products” shall mean Applications and/or Devices. | ||
1168 | |||
1169 | “Permitted Purpose” shall mean | ||
1170 | (i) Licensee’s internal evaluation and testing of Licensed Software, | ||
1171 | (ii) building Demo Units as well as | ||
1172 | (iii) educational use. | ||
1173 | |||
1174 | “Term” shall mean a period of twelve (12) months or any such other period as | ||
1175 | may be agreed between the Parties. | ||
1176 | |||
1177 | For the purpose of this Appendix 5, the following changes shall be agreed with | ||
1178 | respect to relevant Sections of the Agreement: | ||
1179 | I. Recital (A) shall be replaced in its entirety to read as follows: “(A) | ||
1180 | Licensee wishes to use the Licensed Software for the Permitted Purpose.” | ||
1181 | II. Section 3.1 shall be replaced in its entirety to read as follows: “The | ||
1182 | Qt Company grants to Licensee a personal, non-exclusive, | ||
1183 | non-transferable, revocable, royalty-free license, valid for the Term, | ||
1184 | to use, modify and copy the Licensed Software solely for the Permitted | ||
1185 | Purpose. Licensee may install copies of the Licensed Software on an | ||
1186 | unlimited number of computers provided that only Designated Users may | ||
1187 | use the Licensed Software. Licensee may demonstrate the Demo Units, | ||
1188 | provided that such demonstrations must be conducted by Licensee, and | ||
1189 | the Demo Units must remain in Licensee’s possession and under | ||
1190 | Licensee’s control at all times. For clarity, this Agreement does not | ||
1191 | (i) entitle Licensee to use Licensed Software to create Applications | ||
1192 | or Devices (other than prototypes thereof) or | ||
1193 | (ii) carry any distribution rights to Licensee, but such rights are | ||
1194 | subject to and conditional upon conclusion of a separate | ||
1195 | license agreement with The Qt Company.” | ||
1196 | III. Sections 3.2, 3.3, 8 and 10 shall be deleted. | ||
1197 | IV. Section 3.4 shall be replaced in its entirety to read as follows: | ||
1198 | “Licensee shall not: | ||
1199 | - remove or alter any copyright, trademark or other proprietary | ||
1200 | rights notice contained in any portion of the Licensed Software; | ||
1201 | - transfer, publish, sublicense, disclose, display or otherwise make | ||
1202 | the Licensed Software available to any third party (except that | ||
1203 | Licensee may demonstrate the Demo Units pursuant to Section 3.1); | ||
1204 | - in any way combine, incorporate or integrate Licensed Software | ||
1205 | with, or use Licensed Software for creation of, any software | ||
1206 | created with or incorporating Open Source Qt; | ||
1207 | - Licensee shall cause all Designated Users who make use of the | ||
1208 | licenses granted under this Agreement, to be contractually bound to | ||
1209 | comply with the relevant terms of this Agreement and not to use the | ||
1210 | Licensed Software beyond the terms hereof. Licensee shall be | ||
1211 | responsible for any and all actions and omissions of its Designated | ||
1212 | Users relating to the Licensed Software and use thereof. Any use | ||
1213 | of Licensed Software beyond the provisions of this Agreement is | ||
1214 | strictly prohibited and requires an additional license from The Qt | ||
1215 | Company.” | ||
1216 | V. Section 12 shall be replaced in its entirety to read as follows: “This | ||
1217 | Agreement shall enter into force upon due acceptance by both Parties | ||
1218 | and remain in force for the Term, unless and until terminated pursuant | ||
1219 | to the terms of Section 12. Upon termination of the Agreement, Licensee | ||
1220 | shall cease using the Licensed Software. All other copies of Licensed | ||
1221 | Software in the possession or control of Licensee must be erased or | ||
1222 | destroyed. An officer of Licensee must, upon request, promptly deliver | ||
1223 | to The Qt Company a written confirmation that this has occurred.” | ||
1224 | |||
1225 | Except for the modifications specified above, this Appendix carries no change to | ||
1226 | the terms of the Agreement, which shall remain in full force. | ||
1227 | |||
1228 | |||
1229 | APPENDIX 8: QT FOR DEVICE CREATION MCU APPENDIX | ||
1230 | |||
1231 | This Appendix 8 shall be applicable in case the Licensee and/or respective | ||
1232 | Designated User have purchased Qt for Device Creation MCU, either as an | ||
1233 | add-on or standalone package. In case Qt for Device Creation MCU is purchased | ||
1234 | as an addition to Qt for Device Creation, this appendix is an addition to | ||
1235 | Appendix 1. In any other case, this appendix replaces Appendix 1. | ||
1236 | |||
1237 | 1a. Licensed Software - Qt Toolkit | ||
1238 | |||
1239 | Module Description | ||
1240 | Qt Quick Controls 2 Provides lightweight QML types for creating | ||
1241 | performant user interfaces for desktop, embedded, | ||
1242 | and mobile devices. | ||
1243 | |||
1244 | |||
1245 | 1b. Licensed software – Embedded software development libraries | ||
1246 | |||
1247 | Module Description | ||
1248 | Qt Quick Ultralite Qt Quick Ultralite (QUL) rendering engine and sample | ||
1249 | source codes. | ||
1250 | Qt Quick Ultralite Platform adaptations including OS support that allow | ||
1251 | Platform Adaptations applications on QUL to run on microcontrollers | ||
1252 | |||
1253 | |||
1254 | 1c. Licensed Software - Qt Tools/Applications | ||
1255 | |||
1256 | Tool Description | ||
1257 | Qt Creator The integrated development environment for Qt. | ||
1258 | Qt Designer Qt tool for designing and building graphical user | ||
1259 | interfaces. | ||
1260 | Qt Linguist Tool used to add translations to Qt applications. | ||
1261 | Qt Assistant Tool for viewing online documentation in Qt help-file | ||
1262 | format. | ||
1263 | lupdate Tool that finds the translatable strings in the | ||
1264 | specified source, header and Qt Designer interface | ||
1265 | files, and produces or updates translation files. | ||
1266 | lrelease Tool that produces translation files in the compact | ||
1267 | binary format used by localized Qt applications. | ||
1268 | |||
1269 | |||
1270 | 1d. Licensed software – Qt Tools/Applications specific to embedded software | ||
1271 | development | ||
1272 | |||
1273 | Tool Description | ||
1274 | Target toolchains Cross compilation toolchains for supported target | ||
1275 | devices and operating systems. | ||
1276 | qmlinterfaceextractor Tool to generate QML from header file. | ||
1277 | qml2cpp Tool to convert QML to C++ files. | ||
1278 | fontcompiler Tool to compile font meta data and True Type fonts. | ||
1279 | |||
1280 | |||
1281 | 2. Parts of the Licensed Software that are permitted for distribution in | ||
1282 | object-code form only (“Redistributables”) under this Agreement: | ||
1283 | |||
1284 | - The Licensed Software’s Embedded software development libraries | ||
1285 | defined in 1b. | ||
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 1b18f7c2..165aa562 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ | |||
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ | 13 | file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | QT_MODULE = "qtbase" | 16 | QT_MODULE = "qtbase" |
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() { | |||
195 | do_generate_qt_environment_file[umask] = "022" | 195 | do_generate_qt_environment_file[umask] = "022" |
196 | addtask generate_qt_environment_file after do_install before do_package | 196 | addtask generate_qt_environment_file after do_install before do_package |
197 | 197 | ||
198 | SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" | 198 | SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index ea8e3266..cbdbeae7 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -36,6 +36,6 @@ do_configure_prepend() { | |||
36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
37 | } | 37 | } |
38 | 38 | ||
39 | SRCREV = "93361f1a59c1edd2e4eb6d2aa7e2da5b73760a18" | 39 | SRCREV = "96b1b9e3e198e751bb96eeb279106862ca38e7d7" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 09d00f31..80bfb987 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -2,7 +2,7 @@ | |||
2 | # Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.13" | 5 | QT_MODULE_BRANCH ?= "5.14" |
6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" |
7 | 7 | ||
8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | PV = "5.13.2+git${SRCPV}" | 17 | PV = "5.14.0+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 083e5306..154740ee 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ | |||
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ | 13 | file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | require qt5-native.inc | 16 | require qt5-native.inc |
@@ -137,11 +137,9 @@ do_install() { | |||
137 | done | 137 | done |
138 | fi | 138 | fi |
139 | 139 | ||
140 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} | ||
141 | |||
142 | # since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++") | 140 | # since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++") |
143 | # override this until somebody finds a better way | 141 | # override this until somebody finds a better way |
144 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
145 | } | 143 | } |
146 | 144 | ||
147 | SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" | 145 | SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a" |
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 b08ab11f..6157a52c 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 | |||
@@ -18,7 +18,7 @@ diff --git a/configure.pri b/configure.pri | |||
18 | index 3778ece180..94bdfd2649 100644 | 18 | index 3778ece180..94bdfd2649 100644 |
19 | --- a/configure.pri | 19 | --- a/configure.pri |
20 | +++ b/configure.pri | 20 | +++ b/configure.pri |
21 | @@ -851,10 +851,10 @@ defineTest(qtConfOutput_preparePaths) { | 21 | @@ -844,10 +844,10 @@ defineTest(qtConfOutput_preparePaths) { |
22 | 22 | ||
23 | $${currentConfig}.output.qconfigSource = \ | 23 | $${currentConfig}.output.qconfigSource = \ |
24 | "/* Installation Info */" \ | 24 | "/* Installation Info */" \ |
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 00db5344..d5c23c38 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 | |||
@@ -7,13 +7,13 @@ musl does not have feenableexcept function | |||
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | --- | 9 | --- |
10 | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 +- | 10 | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 13 | diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp |
14 | index be2e2a2e08..68aa8369a5 100644 | 14 | index 676c66d..ba05aad 100644 |
15 | --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 15 | --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp |
16 | +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 16 | +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp |
17 | @@ -46,7 +46,7 @@ | 17 | @@ -46,7 +46,7 @@ |
18 | #include <private/qlocale_tools_p.h> | 18 | #include <private/qlocale_tools_p.h> |
19 | #include <qnumeric.h> | 19 | #include <qnumeric.h> |
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 e8d35776..1f1ec8bd 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 | |||
@@ -25,15 +25,15 @@ diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf | |||
25 | index df210fe42d..79a3ddf2f8 100644 | 25 | index df210fe42d..79a3ddf2f8 100644 |
26 | --- a/mkspecs/common/clang.conf | 26 | --- a/mkspecs/common/clang.conf |
27 | +++ b/mkspecs/common/clang.conf | 27 | +++ b/mkspecs/common/clang.conf |
28 | @@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX | 28 | @@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch |
29 | CONFIG += clang_pch_style | 29 | |
30 | QMAKE_PCH_OUTPUT_EXT = .pch | 30 | QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz |
31 | 31 | ||
32 | -QMAKE_CFLAGS_ISYSTEM = -isystem | 32 | -QMAKE_CFLAGS_ISYSTEM = -isystem |
33 | +QMAKE_CFLAGS_ISYSTEM = | 33 | +QMAKE_CFLAGS_ISYSTEM = |
34 | QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | 34 | QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} |
35 | QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} | 35 | QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} |
36 | QMAKE_CFLAGS_LTCG = -flto | 36 | QMAKE_CFLAGS_LTCG = -flto=thin |
37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf | 37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf |
38 | index 44b4267207..9756a02014 100644 | 38 | index 44b4267207..9756a02014 100644 |
39 | --- a/mkspecs/common/gcc-base.conf | 39 | --- a/mkspecs/common/gcc-base.conf |
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 b56224b9..34e41a18 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 | |||
@@ -22,7 +22,7 @@ index a94f6d0eeb..ccab725843 100644 | |||
22 | static:no-static-ltcg { | 22 | static:no-static-ltcg { |
23 | # Static library but no-static-ltcg enabled: skip LTCG | 23 | # Static library but no-static-ltcg enabled: skip LTCG |
24 | -} else: CONFIG(release, debug|release) { | 24 | -} else: CONFIG(release, debug|release) { |
25 | +} else: CONFIG(release, debug|release)!host_build { | 25 | +} else: CONFIG(release, debug|release):!host_build { |
26 | # We need fat object files when creating static libraries on some platforms | 26 | separate_debug_info { |
27 | # so the linker will know to load a particular object from the library | 27 | # Evaluate single-$ variable references that have no valid value at mkspec loading time |
28 | # in the first place. On others, we have special ar and nm to create the symbol | 28 | QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO ~= s/\\$\\{/\$\$\{/ |
diff --git a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch index 4832464f..c027fb68 100644 --- a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch +++ b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | |||
@@ -29,8 +29,8 @@ index 3555763..e7dc57c 100644 | |||
29 | QT_BEGIN_NAMESPACE | 29 | QT_BEGIN_NAMESPACE |
30 | 30 | ||
31 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") | 31 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") |
32 | @@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(in | 32 | @@ -150,7 +155,10 @@ |
33 | qCDebug(qLcEvdevKey) << "switchLed" << led << state; | 33 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); |
34 | 34 | ||
35 | struct ::input_event led_ie; | 35 | struct ::input_event led_ie; |
36 | - ::gettimeofday(&led_ie.time, 0); | 36 | - ::gettimeofday(&led_ie.time, 0); |
@@ -45,7 +45,7 @@ diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/p | |||
45 | index 78728ef..1d65f9b 100644 | 45 | index 78728ef..1d65f9b 100644 |
46 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 46 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
47 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 47 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
48 | @@ -55,6 +55,11 @@ | 48 | @@ -58,6 +58,11 @@ |
49 | #include <linux/input.h> | 49 | #include <linux/input.h> |
50 | #endif | 50 | #endif |
51 | 51 | ||
@@ -57,7 +57,7 @@ index 78728ef..1d65f9b 100644 | |||
57 | #include <math.h> | 57 | #include <math.h> |
58 | 58 | ||
59 | #if QT_CONFIG(mtdev) | 59 | #if QT_CONFIG(mtdev) |
60 | @@ -568,7 +573,7 @@ void QEvdevTouchScreenData::processInput | 60 | @@ -573,7 +578,7 @@ |
61 | 61 | ||
62 | // update timestamps | 62 | // update timestamps |
63 | m_lastTimeStamp = m_timeStamp; | 63 | m_lastTimeStamp = m_timeStamp; |
diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch index 6d480105..2393673f 100644 --- a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch | |||
@@ -27,7 +27,7 @@ diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qcon | |||
27 | index 10458e41d7..8cfa40e461 100644 | 27 | index 10458e41d7..8cfa40e461 100644 |
28 | --- a/src/corelib/global/qconfig-bootstrapped.h | 28 | --- a/src/corelib/global/qconfig-bootstrapped.h |
29 | +++ b/src/corelib/global/qconfig-bootstrapped.h | 29 | +++ b/src/corelib/global/qconfig-bootstrapped.h |
30 | @@ -100,14 +100,14 @@ | 30 | @@ -104,7 +104,7 @@ |
31 | #define QT_FEATURE_process -1 | 31 | #define QT_FEATURE_process -1 |
32 | #define QT_FEATURE_regularexpression -1 | 32 | #define QT_FEATURE_regularexpression -1 |
33 | #ifdef __GLIBC_PREREQ | 33 | #ifdef __GLIBC_PREREQ |
@@ -36,7 +36,8 @@ index 10458e41d7..8cfa40e461 100644 | |||
36 | #else | 36 | #else |
37 | # define QT_FEATURE_renameat2 -1 | 37 | # define QT_FEATURE_renameat2 -1 |
38 | #endif | 38 | #endif |
39 | #define QT_FEATURE_sharedmemory -1 | 39 | @@ -112,7 +112,7 @@ |
40 | #define QT_FEATURE_signaling_nan -1 | ||
40 | #define QT_FEATURE_slog2 -1 | 41 | #define QT_FEATURE_slog2 -1 |
41 | #ifdef __GLIBC_PREREQ | 42 | #ifdef __GLIBC_PREREQ |
42 | -# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) | 43 | -# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) |
@@ -45,12 +46,12 @@ index 10458e41d7..8cfa40e461 100644 | |||
45 | # define QT_FEATURE_statx -1 | 46 | # define QT_FEATURE_statx -1 |
46 | #endif | 47 | #endif |
47 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp | 48 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp |
48 | index b78e037865..9574d1a044 100644 | 49 | index c3abec8..6229c61 100644 |
49 | --- a/src/corelib/io/qfilesystemengine_unix.cpp | 50 | --- a/src/corelib/io/qfilesystemengine_unix.cpp |
50 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp | 51 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp |
51 | @@ -1232,16 +1232,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy | 52 | @@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy |
52 | if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) | 53 | Q_CHECK_FILE_NAME(srcPath, false); |
53 | return emptyFileEntryWarning(), false; | 54 | Q_CHECK_FILE_NAME(tgtPath, false); |
54 | 55 | ||
55 | -#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) | 56 | -#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) |
56 | - if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) | 57 | - if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index f4f0919c..5f6e2e65 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ | |||
9 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 9 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
10 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 10 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ | 12 | file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \ |
13 | " | 13 | " |
14 | 14 | ||
15 | # common for qtbase-native, qtbase-nativesdk and qtbase | 15 | # common for qtbase-native, qtbase-nativesdk and qtbase |
@@ -296,4 +296,4 @@ sed -i \ | |||
296 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 296 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
297 | } | 297 | } |
298 | 298 | ||
299 | SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" | 299 | SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 9b837f08..afc3da92 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "f047b1a9bb73d4b6df24729435e4156dfb84e90e" | 11 | SRCREV = "8ea7ee70c994bcb3e1b20a9e839d26420be082cb" |
12 | 12 | ||
13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index a32bcefb..e8e272f3 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb | |||
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" | |||
11 | 11 | ||
12 | DEPENDS += "qtbase" | 12 | DEPENDS += "qtbase" |
13 | 13 | ||
14 | SRCREV = "bc4dca032f385658898db017af110f4d8e29816d" | 14 | SRCREV = "1d2ba407d26c6c7005e38fe9cec6d0a0ce405309" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 70921fc3..ba97d470 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" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "13b15ab1b1ee2ad56d0d37b07d694fbfc22e97a3" | 22 | SRCREV = "1c92d490766f2ac93bf51771f913fdfe708da188" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index d55adc3e..7bd62837 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "af4466c7af7345a2a92f2523b29e79ce22205003" | 11 | SRCREV = "882075ef10d585c0e5779443a5bde8836b25762d" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 47833942..8a0a1ec3 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -28,6 +28,6 @@ do_install_append_class-nativesdk() { | |||
28 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 28 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
29 | } | 29 | } |
30 | 30 | ||
31 | SRCREV = "4080025fed9d43a78b578bcab67397712459d28c" | 31 | SRCREV = "290251541e615358dcc7a289ff2adb30f309c132" |
32 | 32 | ||
33 | BBCLASSEXTEND =+ "native nativesdk" | 33 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 90411c44..101169b3 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb | |||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" | |||
14 | 14 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "2d5c3c24925bf96f48789fbc0e1b78371ba1170e" | 17 | SRCREV = "8bef70f170bf9803f77971f553ebdc9aac5a3aa6" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 0c733970..e51f3526 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" | |||
18 | # http://errors.yoctoproject.org/Errors/Build/44912/ | 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ |
19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
20 | 20 | ||
21 | SRCREV = "b38eddb4a5aff6dc408b99124ef3c43d80ee88cb" | 21 | SRCREV = "84c446d72349fc99ccad7b738b1a79c4ec36335d" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index bdf6340a..d70ba9de 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" | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "9fe1f2e918d39031852805f1add23125c061d3c3" | 28 | SRCREV = "bcced9cb1baefe3507338a602fe95be915798661" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index c85287d0..3185f5c2 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "6cdc937d5cbfc4ca6b0520c27d0747a66ccb1879" | 12 | SRCREV = "9350fc875a0722e7d05d44f0d53e6aa92122b79c" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index d0969b12..7ed00674 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -36,7 +36,7 @@ SRC_URI += " \ | |||
36 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 36 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV_qtlocation = "b8cc5f3ae51cec793f1a962db88e3c251c983298" | 39 | SRCREV_qtlocation = "dec8f4c7680b47c1386b69829fc1ae7c38e4186f" |
40 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" | 40 | SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" |
41 | 41 | ||
42 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 42 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 9f5d51cc..de16d674 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase qtdeclarative" | 10 | DEPENDS += "qtbase qtdeclarative" |
11 | 11 | ||
12 | SRCREV = "2c681d20c0afd203876bfd733b559eb021aa7cdf" | 12 | SRCREV = "6e1be78c12be9857c6c35bdd6e89331e41708b22" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 4d690964..ddff2949 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "4b3201059dfc2fc5038910c51eb8ca9d75e98765" | 12 | SRCREV = "37ead173bfabc8b930a2a0571ad03a15e86cf7bb" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 11b53496..96331422 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -37,4 +37,4 @@ SRC_URI += "\ | |||
37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 39 | ||
40 | SRCREV = "dce51b45e8d50ad37fea3debb51a84d62e944b5d" | 40 | SRCREV = "d9f2a814eb5d8c2c0e985f60b345fefd956e2bb0" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 309e8189..f3232631 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
@@ -9,4 +9,4 @@ require qt5-git.inc | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "ee0ce46332d364e76e9ec2b0adf7e5cbda504863" | 12 | SRCREV = "abda4bd8ba187aac78052e30b286215b1746783a" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 9f72c1bf..277bdc9a 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" | |||
18 | 18 | ||
19 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
20 | 20 | ||
21 | SRCREV = "b4588093a5a32d12700afa9e0f0ff54df57ffd66" | 21 | SRCREV = "5b3ad68a3a0a6cc9670dc86c3d906ec72181253b" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 4505837e..a6ecad96 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "cc094b80bffd972a1dc071e745888b213dde44f5" | 13 | SRCREV = "ecb890f14ea3b81a97aaca05b6af2508bd6f68a4" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 75ad8b56..f552ef2b 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "c0fb745acdbed0828e3b66f6a6705203a2754591" | 13 | SRCREV = "0d2fc12b65028b4f04bdace3991448813130ab48" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 16afde6a..cf80a83e 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "9a5e84b8f9ca0eeda8170eb93c093f3ab25de988" | 20 | SRCREV = "d88b285166d7963faca84ce8484984a74904f58a" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 8f15b1fe..33b7ed3a 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "44d51ea7b45b2dce1b6772217269a4d1dff88a80" | 28 | SRCREV = "2f00e14a46292afbf036e196aa72dc2f1639bf50" |
29 | 29 | ||
30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 0101da83..d1b3dce1 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -36,4 +36,4 @@ DEPENDS += "qtbase" | |||
36 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 36 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
38 | 38 | ||
39 | SRCREV = "18bade63bdcd1d8fcba013f788e114774efa0e4f" | 39 | SRCREV = "286286f9750a6417b00877c84cf73fc61002c139" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index cdad9d76..e7f58c13 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
@@ -10,7 +10,7 @@ require qt5-git.inc | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "575d92175aec3d6bd84872a9ad00adf924b6993d" | 13 | SRCREV = "5e4882514dc9c5da9b8f268580078d57d50cbce9" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13 |
16 | # 5.13.meta-qt5.1 | 16 | # 5.13.meta-qt5.1 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 59cfe0b4..b8173c41 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
14 | 14 | ||
15 | SRCREV = "e032fe21b6d8d2c92e93ab0ba7a367be23db82b8" | 15 | SRCREV = "615ae0abc1f2b9baf54f196bb5197c25a90304a3" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 07032cdb..3f2b71f4 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "9c498a990646f6d51b461a246b7cce477423721a" | 14 | SRCREV = "08f5114d3943d2b4974384a3e1419690fb3882ab" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 886b8a63..0df2283f 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "2216279ffd43fb84042da2faa5bc432770351ec3" | 15 | SRCREV = "a7e3c9b9538bb87755f2765d2ab4926b2c854066" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index cd59f8f8..9d0696dc 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "582bbf973f608e8a3b9d5e3b8318eb995930e4a0" | 15 | SRCREV = "90e901077aabaab30b585a3e5d6e6e9c93fa6352" |
diff --git a/recipes-qt/qt5/qttools/run-ptest b/recipes-qt/qt5/qttools/run-ptest deleted file mode 100644 index 5cd5e27e..00000000 --- a/recipes-qt/qt5/qttools/run-ptest +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | ./tst_qtdiag | ||
4 | ./tst_qtattributionsscanner | ||
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index e9352e5b..3f22a6e8 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -1,6 +1,5 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | require qt5-git.inc | 2 | require qt5-git.inc |
3 | require qt5-ptest.inc | ||
4 | 3 | ||
5 | HOMEPAGE = "http://www.qt.io" | 4 | HOMEPAGE = "http://www.qt.io" |
6 | LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" | 5 | LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" |
@@ -50,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ | |||
50 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ | 49 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ |
51 | " | 50 | " |
52 | 51 | ||
53 | SRCREV = "78f52a4027da110bf14468b575c7262b4d28d65e" | 52 | SRCREV = "1682033b1bdadefeb9b953f7d9d096d884f797e2" |
54 | 53 | ||
55 | BBCLASSEXTEND = "native nativesdk" | 54 | BBCLASSEXTEND = "native nativesdk" |
56 | 55 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index f36cacf6..f5c5f1ed 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ | |||
98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ | 98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ |
99 | " | 99 | " |
100 | 100 | ||
101 | SRCREV = "36022c8e9263c1940710cd214965979e9bd8a036" | 101 | SRCREV = "fbdeaab046d623f3238fbf0da9c8bdb0009c01a9" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index a6782f46..54c4d5d0 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" | |||
71 | 71 | ||
72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
73 | 73 | ||
74 | SRCREV = "8fc2c34c670fb9bc9ed2393b2d2e1592a74dbfb0" | 74 | SRCREV = "459ec87b0abdd476d415946ed07c8490c10b97f0" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 7cfbcaa1..ce697dba 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -39,7 +39,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris | |||
39 | 39 | ||
40 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 40 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
41 | 41 | ||
42 | SRCREV = "615aa208d131ab99e967725504fcb16fdda4ea83" | 42 | SRCREV = "4e015b3383a218b31cae4437cd30076fb031f3ad" |
43 | 43 | ||
44 | BBCLASSEXTEND =+ "native nativesdk" | 44 | BBCLASSEXTEND =+ "native nativesdk" |
45 | 45 | ||
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 34d4250b..db8a6a92 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
14 | 14 | ||
15 | SRCREV = "3be3e5756f867b34f29f18cbda9b0c2807017a71" | 15 | SRCREV = "e93a22de5465d76d139954c3dd059ed3041ea6b9" |
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 169ed078..7bda76a2 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |||
@@ -13,13 +13,26 @@ for the qmakes's host architecture. | |||
13 | Upstream-Status: Inappropriate [OE specific] | 13 | Upstream-Status: Inappropriate [OE specific] |
14 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | 14 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> |
15 | --- | 15 | --- |
16 | src/buildtools/config/linux.pri | 2 +- | ||
16 | src/buildtools/configure_host.pro | 14 +++++++------- | 17 | src/buildtools/configure_host.pro | 14 +++++++------- |
17 | src/buildtools/gn.pro | 4 ++-- | 18 | src/buildtools/gn.pro | 4 ++-- |
18 | src/core/config/linux.pri | 2 +- | ||
19 | 3 files changed, 10 insertions(+), 10 deletions(-) | 19 | 3 files changed, 10 insertions(+), 10 deletions(-) |
20 | 20 | ||
21 | diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri | ||
22 | index 998aedc..b04db36 100644 | ||
23 | --- a/src/buildtools/config/linux.pri | ||
24 | +++ b/src/buildtools/config/linux.pri | ||
25 | @@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") { | ||
26 | |||
27 | host_build { | ||
28 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | ||
29 | - GN_HOST_CPU = $$gnArch($$QT_ARCH) | ||
30 | + GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) | ||
31 | gn_args += host_cpu=\"$$GN_HOST_CPU\" | ||
32 | # Don't bother trying to use system libraries in this case | ||
33 | gn_args += use_glib=false | ||
21 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 34 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
22 | index dd0d3e32..6312c867 100644 | 35 | index dd0d3e3..6312c86 100644 |
23 | --- a/src/buildtools/configure_host.pro | 36 | --- a/src/buildtools/configure_host.pro |
24 | +++ b/src/buildtools/configure_host.pro | 37 | +++ b/src/buildtools/configure_host.pro |
25 | @@ -4,7 +4,7 @@ TEMPLATE = aux | 38 | @@ -4,7 +4,7 @@ TEMPLATE = aux |
@@ -58,7 +71,7 @@ index dd0d3e32..6312c867 100644 | |||
58 | " nm = \"$$which(nm)\" " \ | 71 | " nm = \"$$which(nm)\" " \ |
59 | " toolchain_args = { " \ | 72 | " toolchain_args = { " \ |
60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro | 73 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro |
61 | index b6bf9cfc..ae419b1a 100644 | 74 | index 033202e..a8ca656 100644 |
62 | --- a/src/buildtools/gn.pro | 75 | --- a/src/buildtools/gn.pro |
63 | +++ b/src/buildtools/gn.pro | 76 | +++ b/src/buildtools/gn.pro |
64 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { | 77 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { |
@@ -72,16 +85,3 @@ index b6bf9cfc..ae419b1a 100644 | |||
72 | 85 | ||
73 | msvc:!clang_cl: gn_gen_args += --use-lto | 86 | msvc:!clang_cl: gn_gen_args += --use-lto |
74 | 87 | ||
75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | ||
76 | index f45c418f..df8ac00b 100644 | ||
77 | --- a/src/core/config/linux.pri | ||
78 | +++ b/src/core/config/linux.pri | ||
79 | @@ -123,7 +123,7 @@ contains(QT_ARCH, "mips") { | ||
80 | |||
81 | host_build { | ||
82 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | ||
83 | - GN_HOST_CPU = $$gnArch($$QT_ARCH) | ||
84 | + GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) | ||
85 | gn_args += host_cpu=\"$$GN_HOST_CPU\" | ||
86 | # Don't bother trying to use system libraries in this case | ||
87 | gn_args += use_glib=false | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch index 1c975aed..ed7f78f6 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch | |||
@@ -13,22 +13,13 @@ of flagging this silent ignoring via [1] | |||
13 | Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] | 13 | Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] |
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
15 | --- | 15 | --- |
16 | chromium/third_party/lss/linux_syscall_support.h | 10 +++++----- | 16 | chromium/third_party/lss/linux_syscall_support.h | 6 +++--- |
17 | 1 file changed, 5 insertions(+), 5 deletions(-) | 17 | 1 file changed, 3 insertions(+), 3 deletions(-) |
18 | 18 | ||
19 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | 19 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h |
20 | index 5d9c2e8582f..e19e51dd304 100644 | 20 | index 9276f56..622cc1f 100644 |
21 | --- a/chromium/third_party/lss/linux_syscall_support.h | 21 | --- a/chromium/third_party/lss/linux_syscall_support.h |
22 | +++ b/chromium/third_party/lss/linux_syscall_support.h | 22 | +++ b/chromium/third_party/lss/linux_syscall_support.h |
23 | @@ -1964,7 +1964,7 @@ struct kernel_statfs { | ||
24 | __asm__ volatile(LSS_ENTRYPOINT \ | ||
25 | : "=a" (__res) \ | ||
26 | : "0" (__NR_##name) \ | ||
27 | - : "esp", "memory"); \ | ||
28 | + : "memory"); \ | ||
29 | LSS_RETURN(type,__res); \ | ||
30 | } | ||
31 | #undef _syscall1 | ||
32 | @@ -2012,7 +2012,7 @@ struct kernel_statfs { | 23 | @@ -2012,7 +2012,7 @@ struct kernel_statfs { |
33 | : "i" (__NR_##name), "ri" ((long)(arg1)), \ | 24 | : "i" (__NR_##name), "ri" ((long)(arg1)), \ |
34 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ | 25 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ |
@@ -56,12 +47,3 @@ index 5d9c2e8582f..e19e51dd304 100644 | |||
56 | LSS_RETURN(int, __res); | 47 | LSS_RETURN(int, __res); |
57 | } | 48 | } |
58 | 49 | ||
59 | @@ -2405,7 +2405,7 @@ struct kernel_statfs { | ||
60 | "d"(LSS_SYSCALL_ARG(parent_tidptr)), | ||
61 | "r"(LSS_SYSCALL_ARG(newtls)), | ||
62 | "r"(LSS_SYSCALL_ARG(child_tidptr)) | ||
63 | - : "rsp", "memory", "r8", "r10", "r11", "rcx"); | ||
64 | + : "memory", "r8", "r10", "r11", "rcx"); | ||
65 | } | ||
66 | LSS_RETURN(int, __res); | ||
67 | } | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch index 4730a6bd..278a9b0c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch | |||
@@ -13,21 +13,7 @@ diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/com | |||
13 | index 17f486447fe..06c93e5b3cf 100644 | 13 | index 17f486447fe..06c93e5b3cf 100644 |
14 | --- a/chromium/build/config/compiler/BUILD.gn | 14 | --- a/chromium/build/config/compiler/BUILD.gn |
15 | +++ b/chromium/build/config/compiler/BUILD.gn | 15 | +++ b/chromium/build/config/compiler/BUILD.gn |
16 | @@ -570,13 +570,6 @@ config("compiler") { | 16 | @@ -773,8 +773,6 @@ config("compiler_cpu_abi") { |
17 | } | ||
18 | } | ||
19 | |||
20 | - # Tells the compiler not to use absolute paths when passing the default | ||
21 | - # paths to the tools it invokes. We don't want this because we don't | ||
22 | - # really need it and it can mess up the goma cache entries. | ||
23 | - if (is_clang && !is_nacl) { | ||
24 | - cflags += [ "-no-canonical-prefixes" ] | ||
25 | - } | ||
26 | - | ||
27 | # C11/C++11 compiler flags setup. | ||
28 | # --------------------------- | ||
29 | if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { | ||
30 | @@ -815,8 +808,6 @@ config("compiler_cpu_abi") { | ||
31 | } | 17 | } |
32 | } else if (current_cpu == "arm") { | 18 | } else if (current_cpu == "arm") { |
33 | if (is_clang && !is_android && !is_nacl) { | 19 | if (is_clang && !is_android && !is_nacl) { |
@@ -36,7 +22,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
36 | } | 22 | } |
37 | if (!is_nacl) { | 23 | if (!is_nacl) { |
38 | cflags += [ | 24 | cflags += [ |
39 | @@ -829,8 +820,6 @@ config("compiler_cpu_abi") { | 25 | @@ -787,8 +785,6 @@ config("compiler_cpu_abi") { |
40 | } | 26 | } |
41 | } else if (current_cpu == "arm64") { | 27 | } else if (current_cpu == "arm64") { |
42 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | 28 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { |
@@ -45,7 +31,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
45 | } | 31 | } |
46 | } else if (current_cpu == "mipsel" && !is_nacl) { | 32 | } else if (current_cpu == "mipsel" && !is_nacl) { |
47 | ldflags += [ "-Wl,--hash-style=sysv" ] | 33 | ldflags += [ "-Wl,--hash-style=sysv" ] |
48 | @@ -839,9 +828,6 @@ config("compiler_cpu_abi") { | 34 | @@ -797,9 +793,6 @@ config("compiler_cpu_abi") { |
49 | if (is_android) { | 35 | if (is_android) { |
50 | cflags += [ "--target=mipsel-linux-android" ] | 36 | cflags += [ "--target=mipsel-linux-android" ] |
51 | ldflags += [ "--target=mipsel-linux-android" ] | 37 | ldflags += [ "--target=mipsel-linux-android" ] |
@@ -55,7 +41,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
55 | } | 41 | } |
56 | } else { | 42 | } else { |
57 | cflags += [ "-EL" ] | 43 | cflags += [ "-EL" ] |
58 | @@ -920,10 +906,7 @@ config("compiler_cpu_abi") { | 44 | @@ -878,10 +871,7 @@ config("compiler_cpu_abi") { |
59 | } else if (current_cpu == "mips" && !is_nacl) { | 45 | } else if (current_cpu == "mips" && !is_nacl) { |
60 | ldflags += [ "-Wl,--hash-style=sysv" ] | 46 | ldflags += [ "-Wl,--hash-style=sysv" ] |
61 | if (custom_toolchain == "") { | 47 | if (custom_toolchain == "") { |
@@ -67,7 +53,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
67 | cflags += [ "-EB" ] | 53 | cflags += [ "-EB" ] |
68 | ldflags += [ "-EB" ] | 54 | ldflags += [ "-EB" ] |
69 | } | 55 | } |
70 | @@ -970,9 +953,6 @@ config("compiler_cpu_abi") { | 56 | @@ -928,9 +918,6 @@ config("compiler_cpu_abi") { |
71 | if (is_android) { | 57 | if (is_android) { |
72 | cflags += [ "--target=mips64el-linux-android" ] | 58 | cflags += [ "--target=mips64el-linux-android" ] |
73 | ldflags += [ "--target=mips64el-linux-android" ] | 59 | ldflags += [ "--target=mips64el-linux-android" ] |
@@ -77,7 +63,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
77 | } | 63 | } |
78 | } else { | 64 | } else { |
79 | cflags += [ | 65 | cflags += [ |
80 | @@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") { | 66 | @@ -987,10 +974,7 @@ config("compiler_cpu_abi") { |
81 | } else if (current_cpu == "mips64") { | 67 | } else if (current_cpu == "mips64") { |
82 | ldflags += [ "-Wl,--hash-style=sysv" ] | 68 | ldflags += [ "-Wl,--hash-style=sysv" ] |
83 | if (custom_toolchain == "") { | 69 | if (custom_toolchain == "") { |
@@ -89,3 +75,17 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
89 | cflags += [ | 75 | cflags += [ |
90 | "-EB", | 76 | "-EB", |
91 | "-mabi=64", | 77 | "-mabi=64", |
78 | @@ -1169,13 +1153,6 @@ config("compiler_deterministic") { | ||
79 | } | ||
80 | } | ||
81 | } | ||
82 | - | ||
83 | - # Tells the compiler not to use absolute paths when passing the default | ||
84 | - # paths to the tools it invokes. We don't want this because we don't | ||
85 | - # really need it and it can mess up the goma cache entries. | ||
86 | - if (is_clang && !is_nacl) { | ||
87 | - cflags += [ "-no-canonical-prefixes" ] | ||
88 | - } | ||
89 | } | ||
90 | |||
91 | config("clang_revision") { | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch index 6ad1febf..bb628fd2 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch | |||
@@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 4 insertions(+), 1 deletion(-) | 15 | 1 file changed, 4 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn | 17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn |
18 | index 458f428b7ce..18b4f23f769 100644 | 18 | index 29dda54..6870dbb 100644 |
19 | --- a/chromium/third_party/zlib/BUILD.gn | 19 | --- a/chromium/third_party/zlib/BUILD.gn |
20 | +++ b/chromium/third_party/zlib/BUILD.gn | 20 | +++ b/chromium/third_party/zlib/BUILD.gn |
21 | @@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { | 21 | @@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) { |
22 | # implement the CRC32* instructions. These are optional in ARMv8.0." | 22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: |
23 | # - Fuchsia just added a syscall for feature detection. | 23 | # "All implementations of the ARMv8.1 architecture are required to |
24 | # TODO(cavalcantii): crbug.com/810125. | 24 | # implement the CRC32* instructions. These are optional in ARMv8.0." |
25 | + defines = [] | 25 | + defines = [] |
26 | if (is_clang && (!is_ios && !is_fuchsia)) { | 26 | if (!is_ios) { |
27 | - defines = [ "CRC32_ARMV8_CRC32" ] | 27 | - defines = [ "CRC32_ARMV8_CRC32" ] |
28 | + if (current_cpu == "arm64") { | 28 | + if (current_cpu == "arm64") { |
29 | + defines += [ "CRC32_ARMV8_CRC32" ] | 29 | + defines += [ "CRC32_ARMV8_CRC32" ] |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch index 4e976b42..12128d3c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | |||
@@ -20,7 +20,7 @@ diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/com | |||
20 | index 06c93e5b3cf..8ba0f8a3109 100644 | 20 | index 06c93e5b3cf..8ba0f8a3109 100644 |
21 | --- a/chromium/build/config/compiler/BUILD.gn | 21 | --- a/chromium/build/config/compiler/BUILD.gn |
22 | +++ b/chromium/build/config/compiler/BUILD.gn | 22 | +++ b/chromium/build/config/compiler/BUILD.gn |
23 | @@ -809,15 +809,6 @@ config("compiler_cpu_abi") { | 23 | @@ -774,15 +774,6 @@ config("compiler_cpu_abi") { |
24 | } else if (current_cpu == "arm") { | 24 | } else if (current_cpu == "arm") { |
25 | if (is_clang && !is_android && !is_nacl) { | 25 | if (is_clang && !is_android && !is_nacl) { |
26 | } | 26 | } |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch index 7f6e4bdf..4dafd779 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch | |||
@@ -24,18 +24,19 @@ moment. | |||
24 | 24 | ||
25 | Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | 25 | Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> |
26 | --- | 26 | --- |
27 | .../skia/src/opts/SkRasterPipeline_opts.h | 15 ++------------- | 27 | .../third_party/skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- |
28 | 1 file changed, 2 insertions(+), 13 deletions(-) | 28 | 1 file changed, 2 insertions(+), 15 deletions(-) |
29 | 29 | ||
30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
31 | index de14e65b94e..b8be7852086 100644 | 31 | index b59506d..b8f22c9 100644 |
32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
34 | @@ -729,12 +729,7 @@ SI F approx_powf(F x, F y) { | 34 | @@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) { |
35 | } | 35 | } |
36 | 36 | ||
37 | SI F from_half(U16 h) { | 37 | SI F from_half(U16 h) { |
38 | -#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | 38 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ |
39 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
39 | - __fp16 fp16; | 40 | - __fp16 fp16; |
40 | - memcpy(&fp16, &h, sizeof(U16)); | 41 | - memcpy(&fp16, &h, sizeof(U16)); |
41 | - return float(fp16); | 42 | - return float(fp16); |
@@ -45,11 +46,12 @@ index de14e65b94e..b8be7852086 100644 | |||
45 | return _mm256_cvtph_ps(h); | 46 | return _mm256_cvtph_ps(h); |
46 | 47 | ||
47 | #else | 48 | #else |
48 | @@ -751,13 +746,7 @@ SI F from_half(U16 h) { | 49 | @@ -995,14 +989,7 @@ SI F from_half(U16 h) { |
49 | } | 50 | } |
50 | 51 | ||
51 | SI U16 to_half(F f) { | 52 | SI U16 to_half(F f) { |
52 | -#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | 53 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ |
54 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
53 | - __fp16 fp16 = __fp16(f); | 55 | - __fp16 fp16 = __fp16(f); |
54 | - U16 u16; | 56 | - U16 u16; |
55 | - memcpy(&u16, &fp16, sizeof(U16)); | 57 | - memcpy(&u16, &fp16, sizeof(U16)); |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch index 80ea3ae1..790bf140 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 2 files changed, 4 insertions(+), 3 deletions(-) | 10 | 2 files changed, 4 insertions(+), 3 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | 12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc |
13 | index 277a7e9338d..2a6e060fa32 100644 | 13 | index 095c49b8dc0..d1479b54d48 100644 |
14 | --- a/chromium/base/threading/platform_thread_linux.cc | 14 | --- a/chromium/base/threading/platform_thread_linux.cc |
15 | +++ b/chromium/base/threading/platform_thread_linux.cc | 15 | +++ b/chromium/base/threading/platform_thread_linux.cc |
16 | @@ -186,7 +186,8 @@ void TerminateOnThread() {} | 16 | @@ -186,7 +186,8 @@ void TerminateOnThread() {} |
@@ -24,10 +24,10 @@ index 277a7e9338d..2a6e060fa32 100644 | |||
24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the | 24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the |
25 | // default stack size isn't enough for some browser tests. | 25 | // default stack size isn't enough for some browser tests. |
26 | diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 26 | diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc |
27 | index 248f93968a6..4bc5ac692af 100644 | 27 | index b2421649ff3..a31b96e90e6 100644 |
28 | --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 28 | --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc |
29 | +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 29 | +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc |
30 | @@ -30,7 +30,7 @@ size_t GetUnderestimatedStackSize() { | 30 | @@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { |
31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size | 31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size |
32 | // correctly for the main thread. | 32 | // correctly for the main thread. |
33 | 33 | ||
@@ -35,8 +35,8 @@ index 248f93968a6..4bc5ac692af 100644 | |||
35 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | 35 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
36 | defined(OS_FUCHSIA) | 36 | defined(OS_FUCHSIA) |
37 | // pthread_getattr_np() can fail if the thread is not invoked by | 37 | // pthread_getattr_np() can fail if the thread is not invoked by |
38 | // pthread_create() (e.g., the main thread of webkit_unit_tests). | 38 | // pthread_create() (e.g., the main thread of blink_unittests). |
39 | @@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() { | 39 | @@ -97,7 +97,7 @@ return Threading::ThreadStackSize(); |
40 | } | 40 | } |
41 | 41 | ||
42 | void* GetStackStart() { | 42 | void* GetStackStart() { |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 7cd006f5..8307e438 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -135,7 +135,7 @@ RDEPENDS_${PN}-examples += " \ | |||
135 | qtdeclarative-qmlplugins \ | 135 | qtdeclarative-qmlplugins \ |
136 | " | 136 | " |
137 | 137 | ||
138 | QT_MODULE_BRANCH_CHROMIUM = "73-based" | 138 | QT_MODULE_BRANCH_CHROMIUM = "77-based" |
139 | 139 | ||
140 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13 | 140 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13 |
141 | # 5.13.meta-qt5.2 | 141 | # 5.13.meta-qt5.2 |
@@ -180,8 +180,8 @@ SRC_URI_append_libc-musl = "\ | |||
180 | file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 180 | file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
181 | " | 181 | " |
182 | 182 | ||
183 | SRCREV_qtwebengine = "556576b55f6b4404c71c74a5ef8e21f87ed09854" | 183 | SRCREV_qtwebengine = "d366f1d5d37ce6f1833ac67c7ebda540b16690f2" |
184 | SRCREV_chromium = "843d70ac87de7482c1c1195aa73899bc05efc8f3" | 184 | SRCREV_chromium = "939daf833fff3a9901afb6fd65d02e0f057a494a" |
185 | SRCREV = "${SRCREV_qtwebengine}" | 185 | SRCREV = "${SRCREV_qtwebengine}" |
186 | 186 | ||
187 | SRCREV_FORMAT = "qtwebengine_chromium" | 187 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index db56a0cb..629cc715 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb | |||
@@ -18,4 +18,4 @@ do_configure_prepend() { | |||
18 | 18 | ||
19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
20 | 20 | ||
21 | SRCREV = "11b83427d9770f50b5d8ec420ec810e393f3af8c" | 21 | SRCREV = "2f47e9505bfc3e8a8adc16e6cc3e381e98cf3c9a" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 69fd08fd..2f7ed0bb 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "a8bbc056335719830a6b2746b7a85cfa2fd89164" | 14 | SRCREV = "9ef6658541c2e816b8119df98c1b66add5b7bcdd" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 9ac6bfd6..71814681 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "2746b310f89e99144fff2a07e945a02e8c51d3da" | 22 | SRCREV = "a02484660ded03bc4a4ea98b1f4c5fb21afdaa4a" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 74a46c9e..07a1c059 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "0f6f4d20f76eaf55eebfddfe49d9a6335f443d65" | 15 | SRCREV = "111908d734b49b31b334cd5af45064aa888ec69a" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 87e2e626..6634011e 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -25,7 +25,7 @@ do_configure_prepend() { | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
27 | 27 | ||
28 | SRCREV = "74c5be960cbd4709cd8e4dee897cf53c00838128" | 28 | SRCREV = "f96db4b6dbcdf9734b8f09dad479daaa923a4065" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||