diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-14 18:37:41 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-02 15:16:18 +0200 |
commit | bf2cafa909a27250f853a823e9d7101307337e7a (patch) | |
tree | 3b70ffa8f12510fb777a42ce7d6eedf4886819d3 | |
parent | c1b0c9f546289b1592d7a895640de103723a0305 (diff) | |
download | meta-qt5-bf2cafa909a27250f853a823e9d7101307337e7a.tar.gz |
qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available
* it's highly recommended to read:
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
to find out how you're affected check which files/tools are
included in your builds, e.g. for qtwebengine:
OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c
11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$
67 ** $QT_BEGIN_LICENSE:BSD$
17 ** $QT_BEGIN_LICENSE:FDL$
61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
261 ** $QT_BEGIN_LICENSE:LGPL$
* change in chromium's LICENSE is only copyright year update
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
66 files changed, 938 insertions, 237 deletions
diff --git a/licenses/The-Qt-Company-GPL-Exception-1.0 b/licenses/The-Qt-Company-GPL-Exception-1.0 new file mode 100644 index 00000000..b1cb1bec --- /dev/null +++ b/licenses/The-Qt-Company-GPL-Exception-1.0 | |||
@@ -0,0 +1,704 @@ | |||
1 | This is the GNU General Public License version 3, annotated with The | ||
2 | Qt Company GPL Exception 1.0: | ||
3 | |||
4 | ------------------------------------------------------------------------- | ||
5 | |||
6 | The Qt Company GPL Exception 1.0 | ||
7 | |||
8 | Exception 1: | ||
9 | |||
10 | As a special exception you may create a larger work which contains the | ||
11 | output of this application and distribute that work under terms of your | ||
12 | choice, so long as the work is not otherwise derived from or based on | ||
13 | this application and so long as the work does not in itself generate | ||
14 | output that contains the output from this application in its original | ||
15 | or modified form. | ||
16 | |||
17 | Exception 2: | ||
18 | |||
19 | As a special exception, you have permission to combine this application | ||
20 | with Plugins licensed under the terms of your choice, to produce an | ||
21 | executable, and to copy and distribute the resulting executable under | ||
22 | the terms of your choice. However, the executable must be accompanied | ||
23 | by a prominent notice offering all users of the executable the entire | ||
24 | source code to this application, excluding the source code of the | ||
25 | independent modules, but including any changes you have made to this | ||
26 | application, under the terms of this license. | ||
27 | |||
28 | |||
29 | ------------------------------------------------------------------------- | ||
30 | |||
31 | GNU GENERAL PUBLIC LICENSE | ||
32 | Version 3, 29 June 2007 | ||
33 | |||
34 | Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> | ||
35 | Everyone is permitted to copy and distribute verbatim copies | ||
36 | of this license document, but changing it is not allowed. | ||
37 | |||
38 | Preamble | ||
39 | |||
40 | The GNU General Public License is a free, copyleft license for | ||
41 | software and other kinds of works. | ||
42 | |||
43 | The licenses for most software and other practical works are designed | ||
44 | to take away your freedom to share and change the works. By contrast, | ||
45 | the GNU General Public License is intended to guarantee your freedom to | ||
46 | share and change all versions of a program--to make sure it remains free | ||
47 | software for all its users. We, the Free Software Foundation, use the | ||
48 | GNU General Public License for most of our software; it applies also to | ||
49 | any other work released this way by its authors. You can apply it to | ||
50 | your programs, too. | ||
51 | |||
52 | When we speak of free software, we are referring to freedom, not | ||
53 | price. Our General Public Licenses are designed to make sure that you | ||
54 | have the freedom to distribute copies of free software (and charge for | ||
55 | them if you wish), that you receive source code or can get it if you | ||
56 | want it, that you can change the software or use pieces of it in new | ||
57 | free programs, and that you know you can do these things. | ||
58 | |||
59 | To protect your rights, we need to prevent others from denying you | ||
60 | these rights or asking you to surrender the rights. Therefore, you have | ||
61 | certain responsibilities if you distribute copies of the software, or if | ||
62 | you modify it: responsibilities to respect the freedom of others. | ||
63 | |||
64 | For example, if you distribute copies of such a program, whether | ||
65 | gratis or for a fee, you must pass on to the recipients the same | ||
66 | freedoms that you received. You must make sure that they, too, receive | ||
67 | or can get the source code. And you must show them these terms so they | ||
68 | know their rights. | ||
69 | |||
70 | Developers that use the GNU GPL protect your rights with two steps: | ||
71 | (1) assert copyright on the software, and (2) offer you this License | ||
72 | giving you legal permission to copy, distribute and/or modify it. | ||
73 | |||
74 | For the developers' and authors' protection, the GPL clearly explains | ||
75 | that there is no warranty for this free software. For both users' and | ||
76 | authors' sake, the GPL requires that modified versions be marked as | ||
77 | changed, so that their problems will not be attributed erroneously to | ||
78 | authors of previous versions. | ||
79 | |||
80 | Some devices are designed to deny users access to install or run | ||
81 | modified versions of the software inside them, although the manufacturer | ||
82 | can do so. This is fundamentally incompatible with the aim of | ||
83 | protecting users' freedom to change the software. The systematic | ||
84 | pattern of such abuse occurs in the area of products for individuals to | ||
85 | use, which is precisely where it is most unacceptable. Therefore, we | ||
86 | have designed this version of the GPL to prohibit the practice for those | ||
87 | products. If such problems arise substantially in other domains, we | ||
88 | stand ready to extend this provision to those domains in future versions | ||
89 | of the GPL, as needed to protect the freedom of users. | ||
90 | |||
91 | Finally, every program is threatened constantly by software patents. | ||
92 | States should not allow patents to restrict development and use of | ||
93 | software on general-purpose computers, but in those that do, we wish to | ||
94 | avoid the special danger that patents applied to a free program could | ||
95 | make it effectively proprietary. To prevent this, the GPL assures that | ||
96 | patents cannot be used to render the program non-free. | ||
97 | |||
98 | The precise terms and conditions for copying, distribution and | ||
99 | modification follow. | ||
100 | |||
101 | TERMS AND CONDITIONS | ||
102 | |||
103 | 0. Definitions. | ||
104 | |||
105 | "This License" refers to version 3 of the GNU General Public License. | ||
106 | |||
107 | "Copyright" also means copyright-like laws that apply to other kinds of | ||
108 | works, such as semiconductor masks. | ||
109 | |||
110 | "The Program" refers to any copyrightable work licensed under this | ||
111 | License. Each licensee is addressed as "you". "Licensees" and | ||
112 | "recipients" may be individuals or organizations. | ||
113 | |||
114 | To "modify" a work means to copy from or adapt all or part of the work | ||
115 | in a fashion requiring copyright permission, other than the making of an | ||
116 | exact copy. The resulting work is called a "modified version" of the | ||
117 | earlier work or a work "based on" the earlier work. | ||
118 | |||
119 | A "covered work" means either the unmodified Program or a work based | ||
120 | on the Program. | ||
121 | |||
122 | To "propagate" a work means to do anything with it that, without | ||
123 | permission, would make you directly or secondarily liable for | ||
124 | infringement under applicable copyright law, except executing it on a | ||
125 | computer or modifying a private copy. Propagation includes copying, | ||
126 | distribution (with or without modification), making available to the | ||
127 | public, and in some countries other activities as well. | ||
128 | |||
129 | To "convey" a work means any kind of propagation that enables other | ||
130 | parties to make or receive copies. Mere interaction with a user through | ||
131 | a computer network, with no transfer of a copy, is not conveying. | ||
132 | |||
133 | An interactive user interface displays "Appropriate Legal Notices" | ||
134 | to the extent that it includes a convenient and prominently visible | ||
135 | feature that (1) displays an appropriate copyright notice, and (2) | ||
136 | tells the user that there is no warranty for the work (except to the | ||
137 | extent that warranties are provided), that licensees may convey the | ||
138 | work under this License, and how to view a copy of this License. If | ||
139 | the interface presents a list of user commands or options, such as a | ||
140 | menu, a prominent item in the list meets this criterion. | ||
141 | |||
142 | 1. Source Code. | ||
143 | |||
144 | The "source code" for a work means the preferred form of the work | ||
145 | for making modifications to it. "Object code" means any non-source | ||
146 | form of a work. | ||
147 | |||
148 | A "Standard Interface" means an interface that either is an official | ||
149 | standard defined by a recognized standards body, or, in the case of | ||
150 | interfaces specified for a particular programming language, one that | ||
151 | is widely used among developers working in that language. | ||
152 | |||
153 | The "System Libraries" of an executable work include anything, other | ||
154 | than the work as a whole, that (a) is included in the normal form of | ||
155 | packaging a Major Component, but which is not part of that Major | ||
156 | Component, and (b) serves only to enable use of the work with that | ||
157 | Major Component, or to implement a Standard Interface for which an | ||
158 | implementation is available to the public in source code form. A | ||
159 | "Major Component", in this context, means a major essential component | ||
160 | (kernel, window system, and so on) of the specific operating system | ||
161 | (if any) on which the executable work runs, or a compiler used to | ||
162 | produce the work, or an object code interpreter used to run it. | ||
163 | |||
164 | The "Corresponding Source" for a work in object code form means all | ||
165 | the source code needed to generate, install, and (for an executable | ||
166 | work) run the object code and to modify the work, including scripts to | ||
167 | control those activities. However, it does not include the work's | ||
168 | System Libraries, or general-purpose tools or generally available free | ||
169 | programs which are used unmodified in performing those activities but | ||
170 | which are not part of the work. For example, Corresponding Source | ||
171 | includes interface definition files associated with source files for | ||
172 | the work, and the source code for shared libraries and dynamically | ||
173 | linked subprograms that the work is specifically designed to require, | ||
174 | such as by intimate data communication or control flow between those | ||
175 | subprograms and other parts of the work. | ||
176 | |||
177 | The Corresponding Source need not include anything that users | ||
178 | can regenerate automatically from other parts of the Corresponding | ||
179 | Source. | ||
180 | |||
181 | The Corresponding Source for a work in source code form is that | ||
182 | same work. | ||
183 | |||
184 | 2. Basic Permissions. | ||
185 | |||
186 | All rights granted under this License are granted for the term of | ||
187 | copyright on the Program, and are irrevocable provided the stated | ||
188 | conditions are met. This License explicitly affirms your unlimited | ||
189 | permission to run the unmodified Program. The output from running a | ||
190 | covered work is covered by this License only if the output, given its | ||
191 | content, constitutes a covered work. This License acknowledges your | ||
192 | rights of fair use or other equivalent, as provided by copyright law. | ||
193 | |||
194 | You may make, run and propagate covered works that you do not | ||
195 | convey, without conditions so long as your license otherwise remains | ||
196 | in force. You may convey covered works to others for the sole purpose | ||
197 | of having them make modifications exclusively for you, or provide you | ||
198 | with facilities for running those works, provided that you comply with | ||
199 | the terms of this License in conveying all material for which you do | ||
200 | not control copyright. Those thus making or running the covered works | ||
201 | for you must do so exclusively on your behalf, under your direction | ||
202 | and control, on terms that prohibit them from making any copies of | ||
203 | your copyrighted material outside their relationship with you. | ||
204 | |||
205 | Conveying under any other circumstances is permitted solely under | ||
206 | the conditions stated below. Sublicensing is not allowed; section 10 | ||
207 | makes it unnecessary. | ||
208 | |||
209 | 3. Protecting Users' Legal Rights From Anti-Circumvention Law. | ||
210 | |||
211 | No covered work shall be deemed part of an effective technological | ||
212 | measure under any applicable law fulfilling obligations under article | ||
213 | 11 of the WIPO copyright treaty adopted on 20 December 1996, or | ||
214 | similar laws prohibiting or restricting circumvention of such | ||
215 | measures. | ||
216 | |||
217 | When you convey a covered work, you waive any legal power to forbid | ||
218 | circumvention of technological measures to the extent such circumvention | ||
219 | is effected by exercising rights under this License with respect to | ||
220 | the covered work, and you disclaim any intention to limit operation or | ||
221 | modification of the work as a means of enforcing, against the work's | ||
222 | users, your or third parties' legal rights to forbid circumvention of | ||
223 | technological measures. | ||
224 | |||
225 | 4. Conveying Verbatim Copies. | ||
226 | |||
227 | You may convey verbatim copies of the Program's source code as you | ||
228 | receive it, in any medium, provided that you conspicuously and | ||
229 | appropriately publish on each copy an appropriate copyright notice; | ||
230 | keep intact all notices stating that this License and any | ||
231 | non-permissive terms added in accord with section 7 apply to the code; | ||
232 | keep intact all notices of the absence of any warranty; and give all | ||
233 | recipients a copy of this License along with the Program. | ||
234 | |||
235 | You may charge any price or no price for each copy that you convey, | ||
236 | and you may offer support or warranty protection for a fee. | ||
237 | |||
238 | 5. Conveying Modified Source Versions. | ||
239 | |||
240 | You may convey a work based on the Program, or the modifications to | ||
241 | produce it from the Program, in the form of source code under the | ||
242 | terms of section 4, provided that you also meet all of these conditions: | ||
243 | |||
244 | a) The work must carry prominent notices stating that you modified | ||
245 | it, and giving a relevant date. | ||
246 | |||
247 | b) The work must carry prominent notices stating that it is | ||
248 | released under this License and any conditions added under section | ||
249 | 7. This requirement modifies the requirement in section 4 to | ||
250 | "keep intact all notices". | ||
251 | |||
252 | c) You must license the entire work, as a whole, under this | ||
253 | License to anyone who comes into possession of a copy. This | ||
254 | License will therefore apply, along with any applicable section 7 | ||
255 | additional terms, to the whole of the work, and all its parts, | ||
256 | regardless of how they are packaged. This License gives no | ||
257 | permission to license the work in any other way, but it does not | ||
258 | invalidate such permission if you have separately received it. | ||
259 | |||
260 | d) If the work has interactive user interfaces, each must display | ||
261 | Appropriate Legal Notices; however, if the Program has interactive | ||
262 | interfaces that do not display Appropriate Legal Notices, your | ||
263 | work need not make them do so. | ||
264 | |||
265 | A compilation of a covered work with other separate and independent | ||
266 | works, which are not by their nature extensions of the covered work, | ||
267 | and which are not combined with it such as to form a larger program, | ||
268 | in or on a volume of a storage or distribution medium, is called an | ||
269 | "aggregate" if the compilation and its resulting copyright are not | ||
270 | used to limit the access or legal rights of the compilation's users | ||
271 | beyond what the individual works permit. Inclusion of a covered work | ||
272 | in an aggregate does not cause this License to apply to the other | ||
273 | parts of the aggregate. | ||
274 | |||
275 | 6. Conveying Non-Source Forms. | ||
276 | |||
277 | You may convey a covered work in object code form under the terms | ||
278 | of sections 4 and 5, provided that you also convey the | ||
279 | machine-readable Corresponding Source under the terms of this License, | ||
280 | in one of these ways: | ||
281 | |||
282 | a) Convey the object code in, or embodied in, a physical product | ||
283 | (including a physical distribution medium), accompanied by the | ||
284 | Corresponding Source fixed on a durable physical medium | ||
285 | customarily used for software interchange. | ||
286 | |||
287 | b) Convey the object code in, or embodied in, a physical product | ||
288 | (including a physical distribution medium), accompanied by a | ||
289 | written offer, valid for at least three years and valid for as | ||
290 | long as you offer spare parts or customer support for that product | ||
291 | model, to give anyone who possesses the object code either (1) a | ||
292 | copy of the Corresponding Source for all the software in the | ||
293 | product that is covered by this License, on a durable physical | ||
294 | medium customarily used for software interchange, for a price no | ||
295 | more than your reasonable cost of physically performing this | ||
296 | conveying of source, or (2) access to copy the | ||
297 | Corresponding Source from a network server at no charge. | ||
298 | |||
299 | c) Convey individual copies of the object code with a copy of the | ||
300 | written offer to provide the Corresponding Source. This | ||
301 | alternative is allowed only occasionally and noncommercially, and | ||
302 | only if you received the object code with such an offer, in accord | ||
303 | with subsection 6b. | ||
304 | |||
305 | d) Convey the object code by offering access from a designated | ||
306 | place (gratis or for a charge), and offer equivalent access to the | ||
307 | Corresponding Source in the same way through the same place at no | ||
308 | further charge. You need not require recipients to copy the | ||
309 | Corresponding Source along with the object code. If the place to | ||
310 | copy the object code is a network server, the Corresponding Source | ||
311 | may be on a different server (operated by you or a third party) | ||
312 | that supports equivalent copying facilities, provided you maintain | ||
313 | clear directions next to the object code saying where to find the | ||
314 | Corresponding Source. Regardless of what server hosts the | ||
315 | Corresponding Source, you remain obligated to ensure that it is | ||
316 | available for as long as needed to satisfy these requirements. | ||
317 | |||
318 | e) Convey the object code using peer-to-peer transmission, provided | ||
319 | you inform other peers where the object code and Corresponding | ||
320 | Source of the work are being offered to the general public at no | ||
321 | charge under subsection 6d. | ||
322 | |||
323 | A separable portion of the object code, whose source code is excluded | ||
324 | from the Corresponding Source as a System Library, need not be | ||
325 | included in conveying the object code work. | ||
326 | |||
327 | A "User Product" is either (1) a "consumer product", which means any | ||
328 | tangible personal property which is normally used for personal, family, | ||
329 | or household purposes, or (2) anything designed or sold for incorporation | ||
330 | into a dwelling. In determining whether a product is a consumer product, | ||
331 | doubtful cases shall be resolved in favor of coverage. For a particular | ||
332 | product received by a particular user, "normally used" refers to a | ||
333 | typical or common use of that class of product, regardless of the status | ||
334 | of the particular user or of the way in which the particular user | ||
335 | actually uses, or expects or is expected to use, the product. A product | ||
336 | is a consumer product regardless of whether the product has substantial | ||
337 | commercial, industrial or non-consumer uses, unless such uses represent | ||
338 | the only significant mode of use of the product. | ||
339 | |||
340 | "Installation Information" for a User Product means any methods, | ||
341 | procedures, authorization keys, or other information required to install | ||
342 | and execute modified versions of a covered work in that User Product from | ||
343 | a modified version of its Corresponding Source. The information must | ||
344 | suffice to ensure that the continued functioning of the modified object | ||
345 | code is in no case prevented or interfered with solely because | ||
346 | modification has been made. | ||
347 | |||
348 | If you convey an object code work under this section in, or with, or | ||
349 | specifically for use in, a User Product, and the conveying occurs as | ||
350 | part of a transaction in which the right of possession and use of the | ||
351 | User Product is transferred to the recipient in perpetuity or for a | ||
352 | fixed term (regardless of how the transaction is characterized), the | ||
353 | Corresponding Source conveyed under this section must be accompanied | ||
354 | by the Installation Information. But this requirement does not apply | ||
355 | if neither you nor any third party retains the ability to install | ||
356 | modified object code on the User Product (for example, the work has | ||
357 | been installed in ROM). | ||
358 | |||
359 | The requirement to provide Installation Information does not include a | ||
360 | requirement to continue to provide support service, warranty, or updates | ||
361 | for a work that has been modified or installed by the recipient, or for | ||
362 | the User Product in which it has been modified or installed. Access to a | ||
363 | network may be denied when the modification itself materially and | ||
364 | adversely affects the operation of the network or violates the rules and | ||
365 | protocols for communication across the network. | ||
366 | |||
367 | Corresponding Source conveyed, and Installation Information provided, | ||
368 | in accord with this section must be in a format that is publicly | ||
369 | documented (and with an implementation available to the public in | ||
370 | source code form), and must require no special password or key for | ||
371 | unpacking, reading or copying. | ||
372 | |||
373 | 7. Additional Terms. | ||
374 | |||
375 | "Additional permissions" are terms that supplement the terms of this | ||
376 | License by making exceptions from one or more of its conditions. | ||
377 | Additional permissions that are applicable to the entire Program shall | ||
378 | be treated as though they were included in this License, to the extent | ||
379 | that they are valid under applicable law. If additional permissions | ||
380 | apply only to part of the Program, that part may be used separately | ||
381 | under those permissions, but the entire Program remains governed by | ||
382 | this License without regard to the additional permissions. | ||
383 | |||
384 | When you convey a copy of a covered work, you may at your option | ||
385 | remove any additional permissions from that copy, or from any part of | ||
386 | it. (Additional permissions may be written to require their own | ||
387 | removal in certain cases when you modify the work.) You may place | ||
388 | additional permissions on material, added by you to a covered work, | ||
389 | for which you have or can give appropriate copyright permission. | ||
390 | |||
391 | Notwithstanding any other provision of this License, for material you | ||
392 | add to a covered work, you may (if authorized by the copyright holders of | ||
393 | that material) supplement the terms of this License with terms: | ||
394 | |||
395 | a) Disclaiming warranty or limiting liability differently from the | ||
396 | terms of sections 15 and 16 of this License; or | ||
397 | |||
398 | b) Requiring preservation of specified reasonable legal notices or | ||
399 | author attributions in that material or in the Appropriate Legal | ||
400 | Notices displayed by works containing it; or | ||
401 | |||
402 | c) Prohibiting misrepresentation of the origin of that material, or | ||
403 | requiring that modified versions of such material be marked in | ||
404 | reasonable ways as different from the original version; or | ||
405 | |||
406 | d) Limiting the use for publicity purposes of names of licensors or | ||
407 | authors of the material; or | ||
408 | |||
409 | e) Declining to grant rights under trademark law for use of some | ||
410 | trade names, trademarks, or service marks; or | ||
411 | |||
412 | f) Requiring indemnification of licensors and authors of that | ||
413 | material by anyone who conveys the material (or modified versions of | ||
414 | it) with contractual assumptions of liability to the recipient, for | ||
415 | any liability that these contractual assumptions directly impose on | ||
416 | those licensors and authors. | ||
417 | |||
418 | All other non-permissive additional terms are considered "further | ||
419 | restrictions" within the meaning of section 10. If the Program as you | ||
420 | received it, or any part of it, contains a notice stating that it is | ||
421 | governed by this License along with a term that is a further | ||
422 | restriction, you may remove that term. If a license document contains | ||
423 | a further restriction but permits relicensing or conveying under this | ||
424 | License, you may add to a covered work material governed by the terms | ||
425 | of that license document, provided that the further restriction does | ||
426 | not survive such relicensing or conveying. | ||
427 | |||
428 | If you add terms to a covered work in accord with this section, you | ||
429 | must place, in the relevant source files, a statement of the | ||
430 | additional terms that apply to those files, or a notice indicating | ||
431 | where to find the applicable terms. | ||
432 | |||
433 | Additional terms, permissive or non-permissive, may be stated in the | ||
434 | form of a separately written license, or stated as exceptions; | ||
435 | the above requirements apply either way. | ||
436 | |||
437 | 8. Termination. | ||
438 | |||
439 | You may not propagate or modify a covered work except as expressly | ||
440 | provided under this License. Any attempt otherwise to propagate or | ||
441 | modify it is void, and will automatically terminate your rights under | ||
442 | this License (including any patent licenses granted under the third | ||
443 | paragraph of section 11). | ||
444 | |||
445 | However, if you cease all violation of this License, then your | ||
446 | license from a particular copyright holder is reinstated (a) | ||
447 | provisionally, unless and until the copyright holder explicitly and | ||
448 | finally terminates your license, and (b) permanently, if the copyright | ||
449 | holder fails to notify you of the violation by some reasonable means | ||
450 | prior to 60 days after the cessation. | ||
451 | |||
452 | Moreover, your license from a particular copyright holder is | ||
453 | reinstated permanently if the copyright holder notifies you of the | ||
454 | violation by some reasonable means, this is the first time you have | ||
455 | received notice of violation of this License (for any work) from that | ||
456 | copyright holder, and you cure the violation prior to 30 days after | ||
457 | your receipt of the notice. | ||
458 | |||
459 | Termination of your rights under this section does not terminate the | ||
460 | licenses of parties who have received copies or rights from you under | ||
461 | this License. If your rights have been terminated and not permanently | ||
462 | reinstated, you do not qualify to receive new licenses for the same | ||
463 | material under section 10. | ||
464 | |||
465 | 9. Acceptance Not Required for Having Copies. | ||
466 | |||
467 | You are not required to accept this License in order to receive or | ||
468 | run a copy of the Program. Ancillary propagation of a covered work | ||
469 | occurring solely as a consequence of using peer-to-peer transmission | ||
470 | to receive a copy likewise does not require acceptance. However, | ||
471 | nothing other than this License grants you permission to propagate or | ||
472 | modify any covered work. These actions infringe copyright if you do | ||
473 | not accept this License. Therefore, by modifying or propagating a | ||
474 | covered work, you indicate your acceptance of this License to do so. | ||
475 | |||
476 | 10. Automatic Licensing of Downstream Recipients. | ||
477 | |||
478 | Each time you convey a covered work, the recipient automatically | ||
479 | receives a license from the original licensors, to run, modify and | ||
480 | propagate that work, subject to this License. You are not responsible | ||
481 | for enforcing compliance by third parties with this License. | ||
482 | |||
483 | An "entity transaction" is a transaction transferring control of an | ||
484 | organization, or substantially all assets of one, or subdividing an | ||
485 | organization, or merging organizations. If propagation of a covered | ||
486 | work results from an entity transaction, each party to that | ||
487 | transaction who receives a copy of the work also receives whatever | ||
488 | licenses to the work the party's predecessor in interest had or could | ||
489 | give under the previous paragraph, plus a right to possession of the | ||
490 | Corresponding Source of the work from the predecessor in interest, if | ||
491 | the predecessor has it or can get it with reasonable efforts. | ||
492 | |||
493 | You may not impose any further restrictions on the exercise of the | ||
494 | rights granted or affirmed under this License. For example, you may | ||
495 | not impose a license fee, royalty, or other charge for exercise of | ||
496 | rights granted under this License, and you may not initiate litigation | ||
497 | (including a cross-claim or counterclaim in a lawsuit) alleging that | ||
498 | any patent claim is infringed by making, using, selling, offering for | ||
499 | sale, or importing the Program or any portion of it. | ||
500 | |||
501 | 11. Patents. | ||
502 | |||
503 | A "contributor" is a copyright holder who authorizes use under this | ||
504 | License of the Program or a work on which the Program is based. The | ||
505 | work thus licensed is called the contributor's "contributor version". | ||
506 | |||
507 | A contributor's "essential patent claims" are all patent claims | ||
508 | owned or controlled by the contributor, whether already acquired or | ||
509 | hereafter acquired, that would be infringed by some manner, permitted | ||
510 | by this License, of making, using, or selling its contributor version, | ||
511 | but do not include claims that would be infringed only as a | ||
512 | consequence of further modification of the contributor version. For | ||
513 | purposes of this definition, "control" includes the right to grant | ||
514 | patent sublicenses in a manner consistent with the requirements of | ||
515 | this License. | ||
516 | |||
517 | Each contributor grants you a non-exclusive, worldwide, royalty-free | ||
518 | patent license under the contributor's essential patent claims, to | ||
519 | make, use, sell, offer for sale, import and otherwise run, modify and | ||
520 | propagate the contents of its contributor version. | ||
521 | |||
522 | In the following three paragraphs, a "patent license" is any express | ||
523 | agreement or commitment, however denominated, not to enforce a patent | ||
524 | (such as an express permission to practice a patent or covenant not to | ||
525 | sue for patent infringement). To "grant" such a patent license to a | ||
526 | party means to make such an agreement or commitment not to enforce a | ||
527 | patent against the party. | ||
528 | |||
529 | If you convey a covered work, knowingly relying on a patent license, | ||
530 | and the Corresponding Source of the work is not available for anyone | ||
531 | to copy, free of charge and under the terms of this License, through a | ||
532 | publicly available network server or other readily accessible means, | ||
533 | then you must either (1) cause the Corresponding Source to be so | ||
534 | available, or (2) arrange to deprive yourself of the benefit of the | ||
535 | patent license for this particular work, or (3) arrange, in a manner | ||
536 | consistent with the requirements of this License, to extend the patent | ||
537 | license to downstream recipients. "Knowingly relying" means you have | ||
538 | actual knowledge that, but for the patent license, your conveying the | ||
539 | covered work in a country, or your recipient's use of the covered work | ||
540 | in a country, would infringe one or more identifiable patents in that | ||
541 | country that you have reason to believe are valid. | ||
542 | |||
543 | If, pursuant to or in connection with a single transaction or | ||
544 | arrangement, you convey, or propagate by procuring conveyance of, a | ||
545 | covered work, and grant a patent license to some of the parties | ||
546 | receiving the covered work authorizing them to use, propagate, modify | ||
547 | or convey a specific copy of the covered work, then the patent license | ||
548 | you grant is automatically extended to all recipients of the covered | ||
549 | work and works based on it. | ||
550 | |||
551 | A patent license is "discriminatory" if it does not include within | ||
552 | the scope of its coverage, prohibits the exercise of, or is | ||
553 | conditioned on the non-exercise of one or more of the rights that are | ||
554 | specifically granted under this License. You may not convey a covered | ||
555 | work if you are a party to an arrangement with a third party that is | ||
556 | in the business of distributing software, under which you make payment | ||
557 | to the third party based on the extent of your activity of conveying | ||
558 | the work, and under which the third party grants, to any of the | ||
559 | parties who would receive the covered work from you, a discriminatory | ||
560 | patent license (a) in connection with copies of the covered work | ||
561 | conveyed by you (or copies made from those copies), or (b) primarily | ||
562 | for and in connection with specific products or compilations that | ||
563 | contain the covered work, unless you entered into that arrangement, | ||
564 | or that patent license was granted, prior to 28 March 2007. | ||
565 | |||
566 | Nothing in this License shall be construed as excluding or limiting | ||
567 | any implied license or other defenses to infringement that may | ||
568 | otherwise be available to you under applicable patent law. | ||
569 | |||
570 | 12. No Surrender of Others' Freedom. | ||
571 | |||
572 | If conditions are imposed on you (whether by court order, agreement or | ||
573 | otherwise) that contradict the conditions of this License, they do not | ||
574 | excuse you from the conditions of this License. If you cannot convey a | ||
575 | covered work so as to satisfy simultaneously your obligations under this | ||
576 | License and any other pertinent obligations, then as a consequence you may | ||
577 | not convey it at all. For example, if you agree to terms that obligate you | ||
578 | to collect a royalty for further conveying from those to whom you convey | ||
579 | the Program, the only way you could satisfy both those terms and this | ||
580 | License would be to refrain entirely from conveying the Program. | ||
581 | |||
582 | 13. Use with the GNU Affero General Public License. | ||
583 | |||
584 | Notwithstanding any other provision of this License, you have | ||
585 | permission to link or combine any covered work with a work licensed | ||
586 | under version 3 of the GNU Affero General Public License into a single | ||
587 | combined work, and to convey the resulting work. The terms of this | ||
588 | License will continue to apply to the part which is the covered work, | ||
589 | but the special requirements of the GNU Affero General Public License, | ||
590 | section 13, concerning interaction through a network will apply to the | ||
591 | combination as such. | ||
592 | |||
593 | 14. Revised Versions of this License. | ||
594 | |||
595 | The Free Software Foundation may publish revised and/or new versions of | ||
596 | the GNU General Public License from time to time. Such new versions will | ||
597 | be similar in spirit to the present version, but may differ in detail to | ||
598 | address new problems or concerns. | ||
599 | |||
600 | Each version is given a distinguishing version number. If the | ||
601 | Program specifies that a certain numbered version of the GNU General | ||
602 | Public License "or any later version" applies to it, you have the | ||
603 | option of following the terms and conditions either of that numbered | ||
604 | version or of any later version published by the Free Software | ||
605 | Foundation. If the Program does not specify a version number of the | ||
606 | GNU General Public License, you may choose any version ever published | ||
607 | by the Free Software Foundation. | ||
608 | |||
609 | If the Program specifies that a proxy can decide which future | ||
610 | versions of the GNU General Public License can be used, that proxy's | ||
611 | public statement of acceptance of a version permanently authorizes you | ||
612 | to choose that version for the Program. | ||
613 | |||
614 | Later license versions may give you additional or different | ||
615 | permissions. However, no additional obligations are imposed on any | ||
616 | author or copyright holder as a result of your choosing to follow a | ||
617 | later version. | ||
618 | |||
619 | 15. Disclaimer of Warranty. | ||
620 | |||
621 | THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY | ||
622 | APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT | ||
623 | HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY | ||
624 | OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, | ||
625 | THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
626 | PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM | ||
627 | IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF | ||
628 | ALL NECESSARY SERVICING, REPAIR OR CORRECTION. | ||
629 | |||
630 | 16. Limitation of Liability. | ||
631 | |||
632 | IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||
633 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS | ||
634 | THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY | ||
635 | GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE | ||
636 | USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF | ||
637 | DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD | ||
638 | PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), | ||
639 | EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF | ||
640 | SUCH DAMAGES. | ||
641 | |||
642 | 17. Interpretation of Sections 15 and 16. | ||
643 | |||
644 | If the disclaimer of warranty and limitation of liability provided | ||
645 | above cannot be given local legal effect according to their terms, | ||
646 | reviewing courts shall apply local law that most closely approximates | ||
647 | an absolute waiver of all civil liability in connection with the | ||
648 | Program, unless a warranty or assumption of liability accompanies a | ||
649 | copy of the Program in return for a fee. | ||
650 | |||
651 | END OF TERMS AND CONDITIONS | ||
652 | |||
653 | How to Apply These Terms to Your New Programs | ||
654 | |||
655 | If you develop a new program, and you want it to be of the greatest | ||
656 | possible use to the public, the best way to achieve this is to make it | ||
657 | free software which everyone can redistribute and change under these terms. | ||
658 | |||
659 | To do so, attach the following notices to the program. It is safest | ||
660 | to attach them to the start of each source file to most effectively | ||
661 | state the exclusion of warranty; and each file should have at least | ||
662 | the "copyright" line and a pointer to where the full notice is found. | ||
663 | |||
664 | <one line to give the program's name and a brief idea of what it does.> | ||
665 | Copyright (C) <year> <name of author> | ||
666 | |||
667 | This program is free software: you can redistribute it and/or modify | ||
668 | it under the terms of the GNU General Public License as published by | ||
669 | the Free Software Foundation, either version 3 of the License, or | ||
670 | (at your option) any later version. | ||
671 | |||
672 | This program is distributed in the hope that it will be useful, | ||
673 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
674 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
675 | GNU General Public License for more details. | ||
676 | |||
677 | You should have received a copy of the GNU General Public License | ||
678 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
679 | |||
680 | Also add information on how to contact you by electronic and paper mail. | ||
681 | |||
682 | If the program does terminal interaction, make it output a short | ||
683 | notice like this when it starts in an interactive mode: | ||
684 | |||
685 | <program> Copyright (C) <year> <name of author> | ||
686 | This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. | ||
687 | This is free software, and you are welcome to redistribute it | ||
688 | under certain conditions; type `show c' for details. | ||
689 | |||
690 | The hypothetical commands `show w' and `show c' should show the appropriate | ||
691 | parts of the General Public License. Of course, your program's commands | ||
692 | might be different; for a GUI interface, you would use an "about box". | ||
693 | |||
694 | You should also get your employer (if you work as a programmer) or school, | ||
695 | if any, to sign a "copyright disclaimer" for the program, if necessary. | ||
696 | For more information on this, and how to apply and follow the GNU GPL, see | ||
697 | <http://www.gnu.org/licenses/>. | ||
698 | |||
699 | The GNU General Public License does not permit incorporating your program | ||
700 | into proprietary programs. If your program is a subroutine library, you | ||
701 | may consider it more useful to permit linking proprietary applications with | ||
702 | the library. If this is what you want to do, use the GNU Lesser General | ||
703 | Public License instead of this License. But first, please read | ||
704 | <http://www.gnu.org/philosophy/why-not-lgpl.html>. | ||
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4e551413..b66c8a5e 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -257,4 +257,4 @@ fakeroot do_generate_qt_environment_file() { | |||
257 | 257 | ||
258 | addtask generate_qt_environment_file after do_install before do_package | 258 | addtask generate_qt_environment_file after do_install before do_package |
259 | 259 | ||
260 | SRCREV = "cec15a89d058424794978910cc8da65b43d71606" | 260 | SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" |
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index c9d22231..8d69ca36 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 778d0c4515bae5bdeb650fb3e6b3e32a73722b51 Mon Sep 17 00:00:00 2001 | 1 | From 16a6bfc8f93f8d4e0d4a6e09cdfb0c4a8412e38f Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> |
3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 | 3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 |
4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
@@ -8,7 +8,7 @@ Subject: [PATCH] Allow a tools-only build | |||
8 | 1 file changed, 6 insertions(+), 1 deletion(-) | 8 | 1 file changed, 6 insertions(+), 1 deletion(-) |
9 | 9 | ||
10 | diff --git a/qt3d.pro b/qt3d.pro | 10 | diff --git a/qt3d.pro b/qt3d.pro |
11 | index a26e76d..263e3c4 100644 | 11 | index a26e76d..016fb30 100644 |
12 | --- a/qt3d.pro | 12 | --- a/qt3d.pro |
13 | +++ b/qt3d.pro | 13 | +++ b/qt3d.pro |
14 | @@ -1,4 +1,4 @@ | 14 | @@ -1,4 +1,4 @@ |
@@ -26,6 +26,3 @@ index a26e76d..263e3c4 100644 | |||
26 | + sub_tools.depends -= sub_src | 26 | + sub_tools.depends -= sub_src |
27 | + SUBDIRS = sub_tools | 27 | + SUBDIRS = sub_tools |
28 | +} | 28 | +} |
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a96b06cf..c3a5bc5a 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \ | |||
27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ | 27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ |
28 | " | 28 | " |
29 | 29 | ||
30 | SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7" | 30 | SRCREV = "be29a39ede4355a5aa18e93c27a75a1c3f81bde4" |
31 | 31 | ||
32 | BBCLASSEXTEND += "native nativesdk" | 32 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 8a6d93e8..8f88b6d4 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -1,8 +1,8 @@ | |||
1 | # Copyright (C) 2012-2016 O.S. Systems Software LTDA. | 1 | # Copyright (C) 2012-2016 O.S. Systems Software LTDA. |
2 | # Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.6" | 5 | QT_MODULE_BRANCH ?= "5.7" |
6 | 6 | ||
7 | # each module needs to define valid SRCREV | 7 | # each module needs to define valid SRCREV |
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
@@ -11,4 +11,4 @@ SRC_URI = " \ | |||
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | PV = "5.6.0+git${SRCPV}" | 14 | PV = "5.6.99+5.7.0-beta+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 73900afe..426e0aeb 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -117,4 +117,4 @@ do_install() { | |||
117 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 117 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
118 | } | 118 | } |
119 | 119 | ||
120 | SRCREV = "cec15a89d058424794978910cc8da65b43d71606" | 120 | SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" |
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 522afcd1..af85fe9d 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cabe9683b82493e2547e87ae0057f44f71efe519 Mon Sep 17 00:00:00 2001 | 1 | From 79f881eaa0a4a980963ce4ea1bc4c5e26c640c9a Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH] Add linux-oe-g++ platform | 4 | Subject: [PATCH] Add linux-oe-g++ platform |
@@ -47,19 +47,19 @@ Upstream-Status: Inappropriate [embedded specific] | |||
47 | Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c | 47 | Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c |
48 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 48 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
49 | --- | 49 | --- |
50 | configure | 71 ++++++++++++++++--------- | 50 | configure | 55 ++++++++++++------- |
51 | mkspecs/features/configure.prf | 4 +- | 51 | mkspecs/features/configure.prf | 4 +- |
52 | mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++ | 52 | mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++ |
53 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ | 53 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ |
54 | 4 files changed, 189 insertions(+), 28 deletions(-) | 54 | 4 files changed, 181 insertions(+), 20 deletions(-) |
55 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf | 55 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf |
56 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 56 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
57 | 57 | ||
58 | diff --git a/configure b/configure | 58 | diff --git a/configure b/configure |
59 | index 3e97c98..88a308d 100755 | 59 | index b65c564..ffe6931 100755 |
60 | --- a/configure | 60 | --- a/configure |
61 | +++ b/configure | 61 | +++ b/configure |
62 | @@ -342,6 +342,16 @@ getQMakeConf() | 62 | @@ -339,6 +339,16 @@ getQMakeConf() |
63 | getSingleQMakeVariable "$1" "$specvals" | 63 | getSingleQMakeVariable "$1" "$specvals" |
64 | } | 64 | } |
65 | 65 | ||
@@ -76,7 +76,7 @@ index 3e97c98..88a308d 100755 | |||
76 | getXQMakeConf() | 76 | getXQMakeConf() |
77 | { | 77 | { |
78 | if [ -z "$xspecvals" ]; then | 78 | if [ -z "$xspecvals" ]; then |
79 | @@ -351,6 +361,16 @@ getXQMakeConf() | 79 | @@ -348,6 +358,16 @@ getXQMakeConf() |
80 | getSingleQMakeVariable "$1" "$xspecvals" | 80 | getSingleQMakeVariable "$1" "$xspecvals" |
81 | } | 81 | } |
82 | 82 | ||
@@ -93,7 +93,7 @@ index 3e97c98..88a308d 100755 | |||
93 | compilerSupportsFlag() | 93 | compilerSupportsFlag() |
94 | { | 94 | { |
95 | cat >conftest.cpp <<EOF | 95 | cat >conftest.cpp <<EOF |
96 | @@ -557,24 +577,14 @@ fi | 96 | @@ -569,24 +589,14 @@ fi |
97 | # initalize variables | 97 | # initalize variables |
98 | #------------------------------------------------------------------------------- | 98 | #------------------------------------------------------------------------------- |
99 | 99 | ||
@@ -124,8 +124,8 @@ index 3e97c98..88a308d 100755 | |||
124 | fi'` | 124 | fi'` |
125 | eval "$cmd" | 125 | eval "$cmd" |
126 | done | 126 | done |
127 | @@ -3418,7 +3428,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 127 | @@ -3428,7 +3438,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then |
128 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no | 128 | [ "$CFG_GTK" = "auto" ] && CFG_GTK=no |
129 | fi | 129 | fi |
130 | 130 | ||
131 | -QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` | 131 | -QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` |
@@ -133,16 +133,16 @@ index 3e97c98..88a308d 100755 | |||
133 | 133 | ||
134 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 134 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
135 | 135 | ||
136 | @@ -3475,7 +3485,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 136 | @@ -3479,7 +3489,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then |
137 | exit 1 | ||
138 | fi | 137 | fi |
139 | fi | 138 | fi |
139 | |||
140 | -TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS` | 140 | -TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS` |
141 | +TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS` | 141 | +TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS` |
142 | 142 | ||
143 | GCC_MACHINE_DUMP= | 143 | GCC_MACHINE_DUMP= |
144 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 144 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
145 | @@ -3976,6 +3986,14 @@ setBootstrapVariable() | 145 | @@ -3878,6 +3888,14 @@ setBootstrapVariable() |
146 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 146 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
147 | } | 147 | } |
148 | 148 | ||
@@ -157,42 +157,19 @@ index 3e97c98..88a308d 100755 | |||
157 | # build qmake | 157 | # build qmake |
158 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 158 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
159 | echo "Creating qmake..." | 159 | echo "Creating qmake..." |
160 | @@ -4014,14 +4032,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 160 | @@ -3977,6 +3995,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
161 | fi | ||
162 | |||
163 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | ||
164 | - setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" | ||
165 | - setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" | ||
166 | - setBootstrapVariable QMAKE_CFLAGS | ||
167 | - setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS | ||
168 | - setBootstrapVariable QMAKE_CXXFLAGS | ||
169 | - setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS | ||
170 | - setBootstrapVariable QMAKE_LFLAGS | ||
171 | - setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS | ||
172 | + setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" | ||
173 | + setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" | ||
174 | + setBootstrapEvalVariable QMAKE_CFLAGS | ||
175 | + setBootstrapEvalVariable QMAKE_CFLAGS_SPLIT_SECTIONS | ||
176 | + setBootstrapEvalVariable QMAKE_CXXFLAGS | ||
177 | + setBootstrapEvalVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS | ||
178 | + setBootstrapEvalVariable QMAKE_LFLAGS | ||
179 | + setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS | ||
180 | |||
181 | if [ "$CFG_RELEASE_TOOLS" = "yes" ]; then | ||
182 | setBootstrapVariable QMAKE_CFLAGS_RELEASE | ||
183 | @@ -4070,6 +4088,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
184 | \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ | ||
185 | \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" | ||
186 | EXEEXT= | 161 | EXEEXT= |
187 | + [ "$QT_CROSS_COMPILE" = "yes" ] && EXEEXT=-target | 162 | ;; |
188 | fi | 163 | esac |
164 | + [ "$QT_CROSS_COMPILE" = "yes" ] && EXEEXT=-target | ||
189 | if [ "$BUILD_ON_MAC" = "yes" ]; then | 165 | if [ "$BUILD_ON_MAC" = "yes" ]; then |
190 | echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" | 166 | echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" |
167 | echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" | ||
191 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | 168 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf |
192 | index 6b37a04..dcf6025 100644 | 169 | index 92c288c..f3019e0 100644 |
193 | --- a/mkspecs/features/configure.prf | 170 | --- a/mkspecs/features/configure.prf |
194 | +++ b/mkspecs/features/configure.prf | 171 | +++ b/mkspecs/features/configure.prf |
195 | @@ -63,12 +63,12 @@ defineTest(qtCompileTest) { | 172 | @@ -63,14 +63,14 @@ defineTest(qtCompileTest) { |
196 | } | 173 | } |
197 | 174 | ||
198 | # Clean up after previous run | 175 | # Clean up after previous run |
@@ -201,7 +178,9 @@ index 6b37a04..dcf6025 100644 | |||
201 | 178 | ||
202 | mkpath($$test_out_dir)|error("Aborting.") | 179 | mkpath($$test_out_dir)|error("Aborting.") |
203 | 180 | ||
204 | qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) -spec $$QMAKESPEC $$qmake_configs $$shell_quote($$test_dir)") { | 181 | !isEmpty (QMAKE_QTCONF): qtconfarg = -qtconf $$QMAKE_QTCONF |
182 | |||
183 | qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qtconfarg -spec $$QMAKESPEC $$qmake_configs $$shell_quote($$test_dir)") { | ||
205 | - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { | 184 | - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { |
206 | + qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { | 185 | + qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { |
207 | log("yes$$escape_expand(\\n)") | 186 | log("yes$$escape_expand(\\n)") |
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 0b0650d3..54895dfb 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1edd17d452a7e9eeb2931b3c5697a4fc0ec4e6bc Mon Sep 17 00:00:00 2001 | 1 | From aaa1675d3c9f0d100f596ca4e2ddf3bd25fae5b6 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the | 4 | Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the |
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
19 | 1 file changed, 4 insertions(+), 1 deletion(-) | 19 | 1 file changed, 4 insertions(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 21 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
22 | index 8bcacca..e1c87b5 100644 | 22 | index 4582001..ff65ef9 100644 |
23 | --- a/src/corelib/global/qlibraryinfo.cpp | 23 | --- a/src/corelib/global/qlibraryinfo.cpp |
24 | +++ b/src/corelib/global/qlibraryinfo.cpp | 24 | +++ b/src/corelib/global/qlibraryinfo.cpp |
25 | @@ -157,7 +157,10 @@ void QLibrarySettings::load() | 25 | @@ -163,7 +163,10 @@ void QLibrarySettings::load() |
26 | 26 | ||
27 | QSettings *QLibraryInfoPrivate::findConfiguration() | 27 | QSettings *QLibraryInfoPrivate::findConfiguration() |
28 | { | 28 | { |
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index ca271e6c..11cd97b0 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3ecdcb6a10d125f1440c42ad9c79f04d43c257e0 Mon Sep 17 00:00:00 2001 | 1 | From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH] Add -external-hostbindir option | 4 | Subject: [PATCH] Add -external-hostbindir option |
@@ -26,21 +26,23 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
26 | 26 | ||
27 | Conflicts: | 27 | Conflicts: |
28 | configure | 28 | configure |
29 | |||
30 | Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 | ||
29 | --- | 31 | --- |
30 | configure | 14 ++++++++++++++ | 32 | configure | 14 ++++++++++++++ |
31 | mkspecs/features/qt_functions.prf | 6 +++++- | 33 | mkspecs/features/qt_functions.prf | 6 +++++- |
32 | mkspecs/features/qt_tool.prf | 5 +++-- | 34 | mkspecs/features/qt_tool.prf | 4 +++- |
33 | qtbase.pro | 13 ++++++++++--- | 35 | qtbase.pro | 16 ++++++++++++++++ |
34 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- | 36 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- |
35 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- | 37 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- |
36 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- | 38 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- |
37 | 7 files changed, 38 insertions(+), 12 deletions(-) | 39 | 7 files changed, 44 insertions(+), 8 deletions(-) |
38 | 40 | ||
39 | diff --git a/configure b/configure | 41 | diff --git a/configure b/configure |
40 | index 88a308d..f2611ed 100755 | 42 | index ffe6931..5aa87b4 100755 |
41 | --- a/configure | 43 | --- a/configure |
42 | +++ b/configure | 44 | +++ b/configure |
43 | @@ -810,6 +810,7 @@ QT_HOST_BINS= | 45 | @@ -825,6 +825,7 @@ QT_HOST_BINS= |
44 | QT_HOST_LIBS= | 46 | QT_HOST_LIBS= |
45 | QT_HOST_DATA= | 47 | QT_HOST_DATA= |
46 | QT_EXT_PREFIX= | 48 | QT_EXT_PREFIX= |
@@ -48,7 +50,7 @@ index 88a308d..f2611ed 100755 | |||
48 | 50 | ||
49 | #flags for SQL drivers | 51 | #flags for SQL drivers |
50 | QT_CFLAGS_PSQL= | 52 | QT_CFLAGS_PSQL= |
51 | @@ -929,6 +930,7 @@ while [ "$#" -gt 0 ]; do | 53 | @@ -944,6 +945,7 @@ while [ "$#" -gt 0 ]; do |
52 | -testsdir| \ | 54 | -testsdir| \ |
53 | -hostdatadir| \ | 55 | -hostdatadir| \ |
54 | -hostbindir| \ | 56 | -hostbindir| \ |
@@ -56,7 +58,7 @@ index 88a308d..f2611ed 100755 | |||
56 | -hostlibdir| \ | 58 | -hostlibdir| \ |
57 | -extprefix| \ | 59 | -extprefix| \ |
58 | -sysroot| \ | 60 | -sysroot| \ |
59 | @@ -1159,6 +1161,9 @@ while [ "$#" -gt 0 ]; do | 61 | @@ -1176,6 +1178,9 @@ while [ "$#" -gt 0 ]; do |
60 | extprefix) | 62 | extprefix) |
61 | QT_EXT_PREFIX="$VAL" | 63 | QT_EXT_PREFIX="$VAL" |
62 | ;; | 64 | ;; |
@@ -66,7 +68,7 @@ index 88a308d..f2611ed 100755 | |||
66 | pkg-config) | 68 | pkg-config) |
67 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 69 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
68 | CFG_PKGCONFIG="$VAL" | 70 | CFG_PKGCONFIG="$VAL" |
69 | @@ -2428,6 +2433,10 @@ Installation options: | 71 | @@ -2438,6 +2443,10 @@ Installation options: |
70 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 72 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
71 | (default HOSTPREFIX) | 73 | (default HOSTPREFIX) |
72 | 74 | ||
@@ -77,7 +79,7 @@ index 88a308d..f2611ed 100755 | |||
77 | Configure options: | 79 | Configure options: |
78 | 80 | ||
79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 81 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
80 | @@ -3172,6 +3181,11 @@ fi | 82 | @@ -3196,6 +3205,11 @@ fi |
81 | # command line and environment validation | 83 | # command line and environment validation |
82 | #------------------------------------------------------------------------------- | 84 | #------------------------------------------------------------------------------- |
83 | 85 | ||
@@ -90,10 +92,10 @@ index 88a308d..f2611ed 100755 | |||
90 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 92 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
91 | case "$CFG_QCONFIG" in | 93 | case "$CFG_QCONFIG" in |
92 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 94 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
93 | index 8639695..d89d948 100644 | 95 | index cfac583..41ca7f1 100644 |
94 | --- a/mkspecs/features/qt_functions.prf | 96 | --- a/mkspecs/features/qt_functions.prf |
95 | +++ b/mkspecs/features/qt_functions.prf | 97 | +++ b/mkspecs/features/qt_functions.prf |
96 | @@ -70,7 +70,11 @@ defineTest(qtHaveModule) { | 98 | @@ -71,7 +71,11 @@ defineTest(qtHaveModule) { |
97 | defineTest(qtPrepareTool) { | 99 | defineTest(qtPrepareTool) { |
98 | cmd = $$eval(QT_TOOL.$${2}.binary) | 100 | cmd = $$eval(QT_TOOL.$${2}.binary) |
99 | isEmpty(cmd) { | 101 | isEmpty(cmd) { |
@@ -104,13 +106,13 @@ index 8639695..d89d948 100644 | |||
104 | + else: \ | 106 | + else: \ |
105 | + cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2 | 107 | + cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2 |
106 | exists($${cmd}.pl) { | 108 | exists($${cmd}.pl) { |
109 | $${1}_EXE = $${cmd}.pl | ||
107 | cmd = perl -w $$system_path($${cmd}.pl) | 110 | cmd = perl -w $$system_path($${cmd}.pl) |
108 | } else: contains(QMAKE_HOST.os, Windows) { | ||
109 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf | 111 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf |
110 | index 839c3d6..45934a0 100644 | 112 | index bdeb59c..b8c539f 100644 |
111 | --- a/mkspecs/features/qt_tool.prf | 113 | --- a/mkspecs/features/qt_tool.prf |
112 | +++ b/mkspecs/features/qt_tool.prf | 114 | +++ b/mkspecs/features/qt_tool.prf |
113 | @@ -14,10 +14,11 @@ load(qt_app) | 115 | @@ -14,10 +14,12 @@ load(qt_app) |
114 | CONFIG += console | 116 | CONFIG += console |
115 | DEFINES *= QT_USE_QSTRINGBUILDER | 117 | DEFINES *= QT_USE_QSTRINGBUILDER |
116 | 118 | ||
@@ -118,37 +120,37 @@ index 839c3d6..45934a0 100644 | |||
118 | + | 120 | + |
119 | # If we are doing a prefix build, create a "module" pri which enables | 121 | # If we are doing a prefix build, create a "module" pri which enables |
120 | # qtPrepareTool() to work with the non-installed build. | 122 | # qtPrepareTool() to work with the non-installed build. |
121 | -# Non-bootstrapped tools always need this because of the environment setup. | 123 | # Non-bootstrapped tools always need this because of the environment setup. |
122 | -!build_pass:if(!host_build|!force_bootstrap|force_independent) { | 124 | -!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)) { |
123 | +!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty(QT_EXTERNAL_HOST_BINS) { | 125 | +!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)):isEmpty(QT_EXTERNAL_HOST_BINS) { |
124 | isEmpty(MODULE):MODULE = $$TARGET | 126 | isEmpty(MODULE):MODULE = $$TARGET |
125 | 127 | ||
126 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) | 128 | load(qt_build_paths) |
127 | diff --git a/qtbase.pro b/qtbase.pro | 129 | diff --git a/qtbase.pro b/qtbase.pro |
128 | index 98ca86a..0eed475 100644 | 130 | index 11cff9e..ec03669 100644 |
129 | --- a/qtbase.pro | 131 | --- a/qtbase.pro |
130 | +++ b/qtbase.pro | 132 | +++ b/qtbase.pro |
131 | @@ -37,12 +37,16 @@ CONFIG -= qt | 133 | @@ -38,6 +38,19 @@ CONFIG -= qt |
132 | 134 | ||
133 | ### installations #### | 135 | ### installations #### |
134 | 136 | ||
135 | +QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS] | 137 | +QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS] |
136 | + | 138 | + |
137 | #qmake | 139 | +#qmake |
138 | qmake.path = $$[QT_HOST_BINS] | 140 | +qmake.path = $$[QT_HOST_BINS] |
139 | +qmake.files = $$OUT_PWD/bin/qmake | 141 | +qmake.files = $$OUT_PWD/bin/qmake |
140 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { | 142 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { |
141 | + qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake | 143 | + qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake |
142 | +} | 144 | +} |
143 | equals(QMAKE_HOST.os, Windows) { | 145 | +equals(QMAKE_HOST.os, Windows) { |
144 | - qmake.files = $$OUT_PWD/bin/qmake.exe | ||
145 | -} else { | ||
146 | - qmake.files = $$OUT_PWD/bin/qmake | ||
147 | + qmake.files = $${qmake.files}.exe | 146 | + qmake.files = $${qmake.files}.exe |
148 | } | 147 | +} |
149 | INSTALLS += qmake | 148 | +INSTALLS += qmake |
150 | 149 | + | |
151 | @@ -59,6 +63,9 @@ INSTALLS += fixqt4headers | 150 | #licheck |
151 | licheck.path = $$[QT_HOST_BINS] | ||
152 | licheck.files = $$PWD/bin/$$QT_LICHECK | ||
153 | @@ -51,6 +64,9 @@ INSTALLS += fixqt4headers | ||
152 | #syncqt | 154 | #syncqt |
153 | syncqt.path = $$[QT_HOST_BINS] | 155 | syncqt.path = $$[QT_HOST_BINS] |
154 | syncqt.files = $$PWD/bin/syncqt.pl | 156 | syncqt.files = $$PWD/bin/syncqt.pl |
@@ -159,7 +161,7 @@ index 98ca86a..0eed475 100644 | |||
159 | 161 | ||
160 | # If we are doing a prefix build, create a "module" pri which enables | 162 | # If we are doing a prefix build, create a "module" pri which enables |
161 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | 163 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in |
162 | index 91a4eb6..25df27c 100644 | 164 | index a5ed8b2..0e11a1e 100644 |
163 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | 165 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in |
164 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | 166 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in |
165 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | 167 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) |
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index a35b6a2a..b3677eb0 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7e5713e7f4807e204cd4a9f874cb1ca2985fc630 Mon Sep 17 00:00:00 2001 | 1 | From ac2f94a42878c1500e1ab6bbbec7834d9e5edfbb Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements |
@@ -68,7 +68,7 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
68 | 2 files changed, 14 insertions(+), 1 deletion(-) | 68 | 2 files changed, 14 insertions(+), 1 deletion(-) |
69 | 69 | ||
70 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf | 70 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf |
71 | index 75b84ff..ab36fa6 100644 | 71 | index 03ec36a..2ab192b 100644 |
72 | --- a/mkspecs/features/qt.prf | 72 | --- a/mkspecs/features/qt.prf |
73 | +++ b/mkspecs/features/qt.prf | 73 | +++ b/mkspecs/features/qt.prf |
74 | @@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { | 74 | @@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { |
@@ -92,7 +92,7 @@ index 75b84ff..ab36fa6 100644 | |||
92 | contains(QT_CONFIG, static) { | 92 | contains(QT_CONFIG, static) { |
93 | QT_PLUGIN_VERIFY += QTPLUGIN | 93 | QT_PLUGIN_VERIFY += QTPLUGIN |
94 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf | 94 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf |
95 | index cc8ed87..b7d4be2 100644 | 95 | index c1c668a..67d916d 100644 |
96 | --- a/mkspecs/features/qt_common.prf | 96 | --- a/mkspecs/features/qt_common.prf |
97 | +++ b/mkspecs/features/qt_common.prf | 97 | +++ b/mkspecs/features/qt_common.prf |
98 | @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { | 98 | @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { |
diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch index e21b36d3..404c0686 100644 --- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e6ed023b0210375e594b7b61dfb620deb486ee8c Mon Sep 17 00:00:00 2001 | 1 | From d108da324156b9d709c106c1698bd7466cb26f69 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 | 3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 |
4 | Subject: [PATCH] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH] configure: bump path length from 256 to 512 characters |
@@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | 14 | 1 file changed, 3 insertions(+), 3 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure b/configure | 16 | diff --git a/configure b/configure |
17 | index f2611ed..24a61db 100755 | 17 | index 5aa87b4..17bca95 100755 |
18 | --- a/configure | 18 | --- a/configure |
19 | +++ b/configure | 19 | +++ b/configure |
20 | @@ -3930,10 +3930,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | 20 | @@ -3832,10 +3832,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ |
21 | static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; | 21 | static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; |
22 | 22 | ||
23 | /* Installation Info */ | 23 | /* Installation Info */ |
diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch index b6758052..92ecb133 100644 --- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 05a3901af7a467f9ea5fa9e6f63a574d8d2a9f77 Mon Sep 17 00:00:00 2001 | 1 | From 17450df40d6c163c85b66c1cc485317fd6f9a9c9 Mon Sep 17 00:00:00 2001 |
2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> | 2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> |
3 | Date: Thu, 16 May 2013 09:52:07 +0300 | 3 | Date: Thu, 16 May 2013 09:52:07 +0300 |
4 | Subject: [PATCH] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH] QOpenGLPaintDevice sub-area support |
@@ -21,10 +21,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
21 | 6 files changed, 23 insertions(+), 3 deletions(-) | 21 | 6 files changed, 23 insertions(+), 3 deletions(-) |
22 | 22 | ||
23 | diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp | 23 | diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp |
24 | index 17a3277..85425da 100644 | 24 | index 75f09d6..17d7155 100644 |
25 | --- a/src/gui/opengl/qopenglpaintdevice.cpp | 25 | --- a/src/gui/opengl/qopenglpaintdevice.cpp |
26 | +++ b/src/gui/opengl/qopenglpaintdevice.cpp | 26 | +++ b/src/gui/opengl/qopenglpaintdevice.cpp |
27 | @@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) | 27 | @@ -141,6 +141,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) |
28 | { | 28 | { |
29 | } | 29 | } |
30 | 30 | ||
@@ -37,7 +37,7 @@ index 17a3277..85425da 100644 | |||
37 | /*! | 37 | /*! |
38 | \internal | 38 | \internal |
39 | */ | 39 | */ |
40 | @@ -216,6 +222,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const | 40 | @@ -222,6 +228,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const |
41 | return d_ptr->ctx; | 41 | return d_ptr->ctx; |
42 | } | 42 | } |
43 | 43 | ||
@@ -50,10 +50,10 @@ index 17a3277..85425da 100644 | |||
50 | Returns the pixel size of the paint device. | 50 | Returns the pixel size of the paint device. |
51 | 51 | ||
52 | diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h | 52 | diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h |
53 | index 804e485..88b481a 100644 | 53 | index dffa68c..66a1e3d 100644 |
54 | --- a/src/gui/opengl/qopenglpaintdevice.h | 54 | --- a/src/gui/opengl/qopenglpaintdevice.h |
55 | +++ b/src/gui/opengl/qopenglpaintdevice.h | 55 | +++ b/src/gui/opengl/qopenglpaintdevice.h |
56 | @@ -53,12 +53,14 @@ public: | 56 | @@ -59,12 +59,14 @@ public: |
57 | QOpenGLPaintDevice(); | 57 | QOpenGLPaintDevice(); |
58 | explicit QOpenGLPaintDevice(const QSize &size); | 58 | explicit QOpenGLPaintDevice(const QSize &size); |
59 | QOpenGLPaintDevice(int width, int height); | 59 | QOpenGLPaintDevice(int width, int height); |
@@ -69,10 +69,10 @@ index 804e485..88b481a 100644 | |||
69 | void setSize(const QSize &size); | 69 | void setSize(const QSize &size); |
70 | void setDevicePixelRatio(qreal devicePixelRatio); | 70 | void setDevicePixelRatio(qreal devicePixelRatio); |
71 | diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h | 71 | diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h |
72 | index 54ea092..f660143 100644 | 72 | index 78e6b7a..6630461 100644 |
73 | --- a/src/gui/opengl/qopenglpaintdevice_p.h | 73 | --- a/src/gui/opengl/qopenglpaintdevice_p.h |
74 | +++ b/src/gui/opengl/qopenglpaintdevice_p.h | 74 | +++ b/src/gui/opengl/qopenglpaintdevice_p.h |
75 | @@ -65,6 +65,7 @@ public: | 75 | @@ -71,6 +71,7 @@ public: |
76 | 76 | ||
77 | public: | 77 | public: |
78 | QSize size; | 78 | QSize size; |
@@ -81,10 +81,10 @@ index 54ea092..f660143 100644 | |||
81 | 81 | ||
82 | qreal dpmx; | 82 | qreal dpmx; |
83 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp | 83 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp |
84 | index 0b92bf4..f41e059 100644 | 84 | index d93871c..be2bee9 100644 |
85 | --- a/src/gui/opengl/qopenglpaintengine.cpp | 85 | --- a/src/gui/opengl/qopenglpaintengine.cpp |
86 | +++ b/src/gui/opengl/qopenglpaintengine.cpp | 86 | +++ b/src/gui/opengl/qopenglpaintengine.cpp |
87 | @@ -2078,7 +2078,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) | 87 | @@ -2084,7 +2084,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) |
88 | for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) | 88 | for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) |
89 | d->vertexAttributeArraysEnabledState[i] = false; | 89 | d->vertexAttributeArraysEnabledState[i] = false; |
90 | 90 | ||
@@ -95,7 +95,7 @@ index 0b92bf4..f41e059 100644 | |||
95 | d->width = sz.width(); | 95 | d->width = sz.width(); |
96 | d->height = sz.height(); | 96 | d->height = sz.height(); |
97 | d->mode = BrushDrawingMode; | 97 | d->mode = BrushDrawingMode; |
98 | @@ -2165,7 +2168,7 @@ void QOpenGL2PaintEngineEx::ensureActive() | 98 | @@ -2171,7 +2174,7 @@ void QOpenGL2PaintEngineEx::ensureActive() |
99 | d->device->ensureActiveTarget(); | 99 | d->device->ensureActiveTarget(); |
100 | 100 | ||
101 | d->transferMode(BrushDrawingMode); | 101 | d->transferMode(BrushDrawingMode); |
@@ -104,7 +104,7 @@ index 0b92bf4..f41e059 100644 | |||
104 | d->needsSync = false; | 104 | d->needsSync = false; |
105 | d->shaderManager->setDirty(); | 105 | d->shaderManager->setDirty(); |
106 | d->syncGlState(); | 106 | d->syncGlState(); |
107 | @@ -2207,6 +2210,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 107 | @@ -2213,6 +2216,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
108 | if (bounds == QRect(0, 0, width, height)) { | 108 | if (bounds == QRect(0, 0, width, height)) { |
109 | funcs.glDisable(GL_SCISSOR_TEST); | 109 | funcs.glDisable(GL_SCISSOR_TEST); |
110 | } else { | 110 | } else { |
@@ -112,7 +112,7 @@ index 0b92bf4..f41e059 100644 | |||
112 | funcs.glEnable(GL_SCISSOR_TEST); | 112 | funcs.glEnable(GL_SCISSOR_TEST); |
113 | setScissor(bounds); | 113 | setScissor(bounds); |
114 | } | 114 | } |
115 | @@ -2215,12 +2219,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 115 | @@ -2221,12 +2225,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
116 | 116 | ||
117 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) | 117 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) |
118 | { | 118 | { |
@@ -128,10 +128,10 @@ index 0b92bf4..f41e059 100644 | |||
128 | 128 | ||
129 | funcs.glScissor(left, bottom, width, height); | 129 | funcs.glScissor(left, bottom, width, height); |
130 | diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h | 130 | diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h |
131 | index f1ec669..6d302b8 100644 | 131 | index c9f3282..7c0616b 100644 |
132 | --- a/src/gui/opengl/qopenglpaintengine_p.h | 132 | --- a/src/gui/opengl/qopenglpaintengine_p.h |
133 | +++ b/src/gui/opengl/qopenglpaintengine_p.h | 133 | +++ b/src/gui/opengl/qopenglpaintengine_p.h |
134 | @@ -264,6 +264,7 @@ public: | 134 | @@ -270,6 +270,7 @@ public: |
135 | QOpenGL2PaintEngineEx* q; | 135 | QOpenGL2PaintEngineEx* q; |
136 | QOpenGLEngineShaderManager* shaderManager; | 136 | QOpenGLEngineShaderManager* shaderManager; |
137 | QOpenGLPaintDevice* device; | 137 | QOpenGLPaintDevice* device; |
@@ -140,10 +140,10 @@ index f1ec669..6d302b8 100644 | |||
140 | QOpenGLContext *ctx; | 140 | QOpenGLContext *ctx; |
141 | EngineMode mode; | 141 | EngineMode mode; |
142 | diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp | 142 | diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp |
143 | index c179143..fad68d5 100644 | 143 | index 8f69095..cf82ee7 100644 |
144 | --- a/src/gui/opengl/qopengltextureglyphcache.cpp | 144 | --- a/src/gui/opengl/qopengltextureglyphcache.cpp |
145 | +++ b/src/gui/opengl/qopengltextureglyphcache.cpp | 145 | +++ b/src/gui/opengl/qopengltextureglyphcache.cpp |
146 | @@ -310,7 +310,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) | 146 | @@ -316,7 +316,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) |
147 | funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); | 147 | funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); |
148 | 148 | ||
149 | if (pex != 0) { | 149 | if (pex != 0) { |
diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch index 2fab8884..4cc8ce6d 100644 --- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6a0d4af2083dbacddb98245c0b4b83c6e014a1ae Mon Sep 17 00:00:00 2001 | 1 | From edb00662de57d0b6ddb39f80800cf3d20c6c07fd Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 8 Jun 2015 13:59:25 -0700 | 3 | Date: Mon, 8 Jun 2015 13:59:25 -0700 |
4 | Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T | 4 | Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T |
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch index 7ca19133..106486f3 100644 --- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch +++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b5c826a39760519010884547d6981c3af031d9c8 Mon Sep 17 00:00:00 2001 | 1 | From e1bc7a14ae9e433112006b1b6944f8b0e3f619ab Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 13 Nov 2015 12:36:11 +0100 | 3 | Date: Fri, 13 Nov 2015 12:36:11 +0100 |
4 | Subject: [PATCH] configure paths for target qmake properly | 4 | Subject: [PATCH] configure paths for target qmake properly |
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
19 | 1 file changed, 19 insertions(+), 4 deletions(-) | 19 | 1 file changed, 19 insertions(+), 4 deletions(-) |
20 | 20 | ||
21 | diff --git a/configure b/configure | 21 | diff --git a/configure b/configure |
22 | index 24a61db..2e99d39 100755 | 22 | index 17bca95..6abdd6b 100755 |
23 | --- a/configure | 23 | --- a/configure |
24 | +++ b/configure | 24 | +++ b/configure |
25 | @@ -3875,8 +3875,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then | 25 | @@ -3777,8 +3777,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then |
26 | QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" | 26 | QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" |
27 | fi | 27 | fi |
28 | 28 | ||
@@ -38,7 +38,7 @@ index 24a61db..2e99d39 100755 | |||
38 | 38 | ||
39 | QT_CONFIGURE_STR_OFF=0 | 39 | QT_CONFIGURE_STR_OFF=0 |
40 | 40 | ||
41 | @@ -3909,7 +3914,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS | 41 | @@ -3811,7 +3816,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS |
42 | 42 | ||
43 | QT_CONFIGURE_STR_OFFSETS= | 43 | QT_CONFIGURE_STR_OFFSETS= |
44 | QT_CONFIGURE_STRS= | 44 | QT_CONFIGURE_STRS= |
@@ -51,7 +51,7 @@ index 24a61db..2e99d39 100755 | |||
51 | addConfStr "$QT_REL_HOST_BINS" | 51 | addConfStr "$QT_REL_HOST_BINS" |
52 | addConfStr "$QT_REL_HOST_LIBS" | 52 | addConfStr "$QT_REL_HOST_LIBS" |
53 | addConfStr "$QT_REL_HOST_DATA" | 53 | addConfStr "$QT_REL_HOST_DATA" |
54 | @@ -3921,6 +3930,12 @@ addConfStr "$shortspec" | 54 | @@ -3823,6 +3832,12 @@ addConfStr "$shortspec" |
55 | #------------------------------------------------------------------------------- | 55 | #------------------------------------------------------------------------------- |
56 | [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" | 56 | [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" |
57 | 57 | ||
@@ -64,7 +64,7 @@ index 24a61db..2e99d39 100755 | |||
64 | cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF | 64 | cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF |
65 | /* License Info */ | 65 | /* License Info */ |
66 | static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; | 66 | static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; |
67 | @@ -3933,7 +3948,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 | 67 | @@ -3835,7 +3850,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 |
68 | static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; | 68 | static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; |
69 | #ifdef QT_BUILD_QMAKE | 69 | #ifdef QT_BUILD_QMAKE |
70 | static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; | 70 | static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; |
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch index 230c966d..bee10d55 100644 --- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 49b2100ff86ab5b4977608903b30cb71075592c6 Mon Sep 17 00:00:00 2001 | 1 | From 14b037afc3fa6992733891205a46b44991402afb Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH] Always build uic | 4 | Subject: [PATCH] Always build uic |
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/src.pro b/src/src.pro | 16 | diff --git a/src/src.pro b/src/src.pro |
17 | index 1671338..83de483 100644 | 17 | index 4a165a2..0f84791 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -180,7 +180,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent | 20 | @@ -180,7 +180,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent |
diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch index 5bb73e75..949b323f 100644 --- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5b4ae15a19a9135d3dc8a35aa2d109ba8d29868a Mon Sep 17 00:00:00 2001 | 1 | From 6df8d620081bd78319fc97846e52b1a83042401a Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH] Add -external-hostbindir option for native(sdk) |
@@ -37,10 +37,10 @@ Conflicts: | |||
37 | 5 files changed, 16 insertions(+), 1 deletion(-) | 37 | 5 files changed, 16 insertions(+), 1 deletion(-) |
38 | 38 | ||
39 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
40 | index 2e99d39..a0641d2 100755 | 40 | index 6abdd6b..7c5a066 100755 |
41 | --- a/configure | 41 | --- a/configure |
42 | +++ b/configure | 42 | +++ b/configure |
43 | @@ -3922,6 +3922,7 @@ fi | 43 | @@ -3824,6 +3824,7 @@ fi |
44 | addConfStr "$QT_REL_HOST_BINS" | 44 | addConfStr "$QT_REL_HOST_BINS" |
45 | addConfStr "$QT_REL_HOST_LIBS" | 45 | addConfStr "$QT_REL_HOST_LIBS" |
46 | addConfStr "$QT_REL_HOST_DATA" | 46 | addConfStr "$QT_REL_HOST_DATA" |
@@ -49,10 +49,10 @@ index 2e99d39..a0641d2 100755 | |||
49 | addConfStr "$shortspec" | 49 | addConfStr "$shortspec" |
50 | 50 | ||
51 | diff --git a/qmake/property.cpp b/qmake/property.cpp | 51 | diff --git a/qmake/property.cpp b/qmake/property.cpp |
52 | index 817ae95..c69539f 100644 | 52 | index 9ee08f4..e6ecf92 100644 |
53 | --- a/qmake/property.cpp | 53 | --- a/qmake/property.cpp |
54 | +++ b/qmake/property.cpp | 54 | +++ b/qmake/property.cpp |
55 | @@ -68,6 +68,7 @@ static const struct { | 55 | @@ -63,6 +63,7 @@ static const struct { |
56 | { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, | 56 | { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, |
57 | { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, | 57 | { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, |
58 | { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, | 58 | { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, |
@@ -61,10 +61,10 @@ index 817ae95..c69539f 100644 | |||
61 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, | 61 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, |
62 | }; | 62 | }; |
63 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 63 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
64 | index e1c87b5..d6e03ba 100644 | 64 | index ff65ef9..3726831 100644 |
65 | --- a/src/corelib/global/qlibraryinfo.cpp | 65 | --- a/src/corelib/global/qlibraryinfo.cpp |
66 | +++ b/src/corelib/global/qlibraryinfo.cpp | 66 | +++ b/src/corelib/global/qlibraryinfo.cpp |
67 | @@ -373,7 +373,7 @@ QLibraryInfo::isDebugBuild() | 67 | @@ -381,7 +381,7 @@ QLibraryInfo::isDebugBuild() |
68 | */ | 68 | */ |
69 | 69 | ||
70 | static const struct { | 70 | static const struct { |
@@ -73,7 +73,7 @@ index e1c87b5..d6e03ba 100644 | |||
73 | } qtConfEntries[] = { | 73 | } qtConfEntries[] = { |
74 | { "Prefix", "." }, | 74 | { "Prefix", "." }, |
75 | { "Documentation", "doc" }, // should be ${Data}/doc | 75 | { "Documentation", "doc" }, // should be ${Data}/doc |
76 | @@ -398,6 +398,7 @@ static const struct { | 76 | @@ -406,6 +406,7 @@ static const struct { |
77 | { "HostBinaries", "bin" }, | 77 | { "HostBinaries", "bin" }, |
78 | { "HostLibraries", "lib" }, | 78 | { "HostLibraries", "lib" }, |
79 | { "HostData", "." }, | 79 | { "HostData", "." }, |
@@ -82,10 +82,10 @@ index e1c87b5..d6e03ba 100644 | |||
82 | { "HostSpec", "" }, | 82 | { "HostSpec", "" }, |
83 | { "HostPrefix", "" }, | 83 | { "HostPrefix", "" }, |
84 | diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h | 84 | diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h |
85 | index 1ad7637..5a8b127 100644 | 85 | index 362d47d..a2326e2 100644 |
86 | --- a/src/corelib/global/qlibraryinfo.h | 86 | --- a/src/corelib/global/qlibraryinfo.h |
87 | +++ b/src/corelib/global/qlibraryinfo.h | 87 | +++ b/src/corelib/global/qlibraryinfo.h |
88 | @@ -81,6 +81,7 @@ public: | 88 | @@ -87,6 +87,7 @@ public: |
89 | HostBinariesPath, | 89 | HostBinariesPath, |
90 | HostLibrariesPath, | 90 | HostLibrariesPath, |
91 | HostDataPath, | 91 | HostDataPath, |
@@ -94,10 +94,10 @@ index 1ad7637..5a8b127 100644 | |||
94 | HostSpecPath, | 94 | HostSpecPath, |
95 | HostPrefixPath, | 95 | HostPrefixPath, |
96 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 96 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
97 | index 6f1e2b7..ae03143 100644 | 97 | index 7fd0b98..47fa6c3 100644 |
98 | --- a/tools/configure/configureapp.cpp | 98 | --- a/tools/configure/configureapp.cpp |
99 | +++ b/tools/configure/configureapp.cpp | 99 | +++ b/tools/configure/configureapp.cpp |
100 | @@ -1256,6 +1256,13 @@ void Configure::parseCmdLine() | 100 | @@ -1202,6 +1202,13 @@ void Configure::parseCmdLine() |
101 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); | 101 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); |
102 | } | 102 | } |
103 | 103 | ||
@@ -111,7 +111,7 @@ index 6f1e2b7..ae03143 100644 | |||
111 | else if (configCmdLine.at(i) == "-make-tool") { | 111 | else if (configCmdLine.at(i) == "-make-tool") { |
112 | ++i; | 112 | ++i; |
113 | if (i == argCount) | 113 | if (i == argCount) |
114 | @@ -4232,6 +4239,9 @@ void Configure::generateQConfigCpp() | 114 | @@ -4121,6 +4128,9 @@ void Configure::generateQConfigCpp() |
115 | 115 | ||
116 | if (dictionary["QT_REL_HOST_DATA"].isEmpty()) | 116 | if (dictionary["QT_REL_HOST_DATA"].isEmpty()) |
117 | dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; | 117 | dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; |
@@ -121,7 +121,7 @@ index 6f1e2b7..ae03143 100644 | |||
121 | 121 | ||
122 | confStringOff = 0; | 122 | confStringOff = 0; |
123 | addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); | 123 | addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); |
124 | @@ -4251,6 +4261,7 @@ void Configure::generateQConfigCpp() | 124 | @@ -4140,6 +4150,7 @@ void Configure::generateQConfigCpp() |
125 | addConfStr(1, dictionary["QT_REL_HOST_BINS"]); | 125 | addConfStr(1, dictionary["QT_REL_HOST_BINS"]); |
126 | addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); | 126 | addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); |
127 | addConfStr(1, dictionary["QT_REL_HOST_DATA"]); | 127 | addConfStr(1, dictionary["QT_REL_HOST_DATA"]); |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index b85c5632..051ec89d 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -261,4 +261,4 @@ sysroot_stage_dirs_append() { | |||
261 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} | 261 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} |
262 | } | 262 | } |
263 | 263 | ||
264 | SRCREV = "cec15a89d058424794978910cc8da65b43d71606" | 264 | SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 5b12d1a7..a1c8f7fd 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS = "qtdeclarative" | 11 | DEPENDS = "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "791ddce7d41b126ba4744a6701597f49dbf99f3b" | 13 | SRCREV = "32404e27101c5ec81b4ab965faf38263429bbc5a" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 03990d85..b84ad040 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -25,4 +25,4 @@ do_configure_prepend() { | |||
25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro | 25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "dedff12a896d51c469d2af82664b86a10f8fa7fe" | 28 | SRCREV = "f8759f683cfc433c432059e1160d2ab657baaec6" |
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index ee568200..1a8a5f0f 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d26a676827ef2d64b4627090690d3240e62f6565 Mon Sep 17 00:00:00 2001 | 1 | From c978b2ed0e1ce48b2d4a4a6eb660927bc88aed57 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> |
3 | Date: Sun, 26 May 2013 14:26:19 +0200 | 3 | Date: Sun, 26 May 2013 14:26:19 +0200 |
4 | Subject: [PATCH] qmltestexample: fix link | 4 | Subject: [PATCH] qmltestexample: fix link |
@@ -15,12 +15,11 @@ Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450 | |||
15 | Signed-off-by: Eric Bénard <eric@eukrea.com> | 15 | Signed-off-by: Eric Bénard <eric@eukrea.com> |
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
17 | --- | 17 | --- |
18 | examples/qmltest/qmltest/qmltest.pro | 2 +- | 18 | examples/qmltest/qmltest/qmltest.pro | 2 +- |
19 | tests/auto/qml/qjsengine/qjsengine.pro | 2 +- | 19 | tests/auto/qml/qjsengine/qjsengine.pro | 2 +- |
20 | tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | 2 +- | 20 | tests/auto/qmltest/qmltest.pro | 1 + |
21 | tests/auto/qmltest/qmltest.pro | 1 + | 21 | tools/qmltestrunner/qmltestrunner.pro | 2 +- |
22 | tools/qmltestrunner/qmltestrunner.pro | 2 +- | 22 | 4 files changed, 4 insertions(+), 3 deletions(-) |
23 | 5 files changed, 5 insertions(+), 4 deletions(-) | ||
24 | 23 | ||
25 | diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro | 24 | diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro |
26 | index b5893c5..1b00e6c 100644 | 25 | index b5893c5..1b00e6c 100644 |
@@ -36,31 +35,19 @@ index b5893c5..1b00e6c 100644 | |||
36 | macx: CONFIG -= app_bundle | 35 | macx: CONFIG -= app_bundle |
37 | 36 | ||
38 | diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro | 37 | diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro |
39 | index fc2452c..919710f 100644 | 38 | index c9d78e2..5861613 100644 |
40 | --- a/tests/auto/qml/qjsengine/qjsengine.pro | 39 | --- a/tests/auto/qml/qjsengine/qjsengine.pro |
41 | +++ b/tests/auto/qml/qjsengine/qjsengine.pro | 40 | +++ b/tests/auto/qml/qjsengine/qjsengine.pro |
42 | @@ -1,7 +1,7 @@ | 41 | @@ -1,6 +1,6 @@ |
43 | CONFIG += testcase | 42 | CONFIG += testcase |
44 | CONFIG += parallel_test | ||
45 | TARGET = tst_qjsengine | 43 | TARGET = tst_qjsengine |
46 | -QT += qml qml-private widgets testlib gui-private | 44 | -QT += qml qml-private widgets testlib gui-private |
47 | +QT += qml qml-private widgets testlib gui-private quick | 45 | +QT += qml qml-private widgets testlib gui-private quick |
48 | macx:CONFIG -= app_bundle | 46 | macx:CONFIG -= app_bundle |
49 | SOURCES += tst_qjsengine.cpp | 47 | SOURCES += tst_qjsengine.cpp |
50 | RESOURCES += qjsengine.qrc | 48 | RESOURCES += qjsengine.qrc |
51 | diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | ||
52 | index c6d442e..3181dcd 100644 | ||
53 | --- a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | ||
54 | +++ b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | ||
55 | @@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle | ||
56 | |||
57 | TESTDATA = data/* | ||
58 | |||
59 | -QT += core-private qml-private testlib gui gui-private | ||
60 | +QT += core-private qml-private testlib gui gui-private quick | ||
61 | DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 | ||
62 | diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro | 49 | diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro |
63 | index 7662cb1..a8f8ae2 100644 | 50 | index 54db7a7..8c6986c 100644 |
64 | --- a/tests/auto/qmltest/qmltest.pro | 51 | --- a/tests/auto/qmltest/qmltest.pro |
65 | +++ b/tests/auto/qmltest/qmltest.pro | 52 | +++ b/tests/auto/qmltest/qmltest.pro |
66 | @@ -4,6 +4,7 @@ CONFIG += qmltestcase | 53 | @@ -4,6 +4,7 @@ CONFIG += qmltestcase |
diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch index 60c9685f..dc707abf 100644 --- a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch +++ b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9d39293e354120a9ec5e92c87b4cd695acdeb3f5 Mon Sep 17 00:00:00 2001 | 1 | From 493e91c9c3527d577f7051de9a582a178ca43fcf Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 | 3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 |
4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been | 4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 72b3d7be..5e966330 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -34,6 +34,6 @@ do_configure_prepend() { | |||
34 | 34 | ||
35 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 35 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
36 | 36 | ||
37 | SRCREV = "26ff8f9029107877bfbfdc2f099f9b11861183ed" | 37 | SRCREV = "31ef2e858c2a0835c040b3199c9557f0f6c66808" |
38 | 38 | ||
39 | BBCLASSEXTEND =+ "native nativesdk" | 39 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 04f5a79d..d5e8dfa4 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | 12 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
13 | 13 | ||
14 | SRCREV = "cf717b99fdb1b7221dd556bf3be32feba0ed8afe" | 14 | SRCREV = "0f6e294fb8534f677a5ec75113679cfe24f559c1" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 606b873a..1ecc4f70 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative" | |||
17 | 17 | ||
18 | RDEPENDS_${PN}-dev = "" | 18 | RDEPENDS_${PN}-dev = "" |
19 | 19 | ||
20 | SRCREV = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf" | 20 | SRCREV = "d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b" |
diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch index 12118980..11a97260 100644 --- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +++ b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c4c008c46291be290312b5674af1c1b9c446fa8e Mon Sep 17 00:00:00 2001 | 1 | From 6f01ba8602a4efdb31bf01bf58aa4cb23552e9ac Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 4 Aug 2014 19:19:05 +0200 | 3 | Date: Mon, 4 Aug 2014 19:19:05 +0200 |
4 | Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic | 4 | Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 573b3303..6c983c24 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+ | |||
28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" |
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" |
30 | 30 | ||
31 | SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f" | 31 | SRCREV = "42b07b2ddf443d3eafd18e169f2e5ab5e36604a5" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 8a41551b..ce240c52 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -29,4 +29,4 @@ do_configure_prepend() { | |||
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
31 | 31 | ||
32 | SRCREV = "d1f66746ab0b77b4f3300cbeeaafe61d25d78e98" | 32 | SRCREV = "e41c3a9b345536ccee0840ac6f049173aa6a0785" |
diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch index 05f54732..81fcd392 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 98455d75df7b040817e323417b6042118c093d56 Mon Sep 17 00:00:00 2001 | 1 | From df587e2a3bb2aa297088bd3ada4309c4b9a85195 Mon Sep 17 00:00:00 2001 |
2 | From: Yoann Lopes <yoann.lopes@digia.com> | 2 | From: Yoann Lopes <yoann.lopes@digia.com> |
3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 | 3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 |
4 | Subject: [PATCH] Initial porting effort to GStreamer 1.0. | 4 | Subject: [PATCH] Initial porting effort to GStreamer 1.0. |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 328fdd74..5c723376 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -35,4 +35,4 @@ SRC_URI += "\ | |||
35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ | 35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ |
36 | " | 36 | " |
37 | 37 | ||
38 | SRCREV = "2170a3b0fcda613daf76a337fa45cb97e0714cdf" | 38 | SRCREV = "c85fd6df07935b9c0fa08f881271cd94ad100003" |
diff --git a/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch b/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch new file mode 100644 index 00000000..27a2140c --- /dev/null +++ b/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 450d5dee6cc4f35a7475af507b90ba67327ad724 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 26 Apr 2016 17:48:18 +0200 | ||
4 | Subject: [PATCH] qdeclarativetextinput: update to match QWidgetLineControl API | ||
5 | change | ||
6 | |||
7 | * setCursorBlinkPeriod was replaced with setBlinkingCursorEnabled & | ||
8 | updateCursorBlinking in qtbase commit: | ||
9 | commit 1b5bc9723c0b23ca5197097c3087df6bbe024a2a | ||
10 | Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | ||
11 | Date: Tue Apr 19 10:15:54 2016 +0200 | ||
12 | Subject: QWidgetLineControl: respect run-time changes to cursorFlashTime | ||
13 | |||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | --- | ||
16 | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp | ||
20 | index 3ff75fd..e39d1af 100644 | ||
21 | --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp | ||
22 | +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp | ||
23 | @@ -514,7 +514,7 @@ void QDeclarativeTextInput::setCursorVisible(bool on) | ||
24 | if (d->cursorVisible == on) | ||
25 | return; | ||
26 | d->cursorVisible = on; | ||
27 | - d->control->setCursorBlinkPeriod(on?QApplication::cursorFlashTime():0); | ||
28 | + d->control->setBlinkingCursorEnabled(on); | ||
29 | QRect r = d->control->cursorRect(); | ||
30 | if (d->control->inputMask().isEmpty()) | ||
31 | updateRect(r); | ||
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 61b02a17..e34cc227 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -7,7 +7,7 @@ require qt5-git.inc | |||
7 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 7 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
8 | LIC_FILES_CHKSUM = " \ | 8 | LIC_FILES_CHKSUM = " \ |
9 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 9 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ |
10 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 10 | file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ |
11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 13 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ |
@@ -16,6 +16,8 @@ LIC_FILES_CHKSUM = " \ | |||
16 | DEPENDS += "qtscript qtsvg qtxmlpatterns" | 16 | DEPENDS += "qtscript qtsvg qtxmlpatterns" |
17 | # qttools | 17 | # qttools |
18 | 18 | ||
19 | SRC_URI += "file://0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch" | ||
20 | |||
19 | PACKAGECONFIG ??= "webkit" | 21 | PACKAGECONFIG ??= "webkit" |
20 | PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit" | 22 | PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit" |
21 | 23 | ||
@@ -23,4 +25,4 @@ do_configure_prepend() { | |||
23 | sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro | 25 | sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro |
24 | } | 26 | } |
25 | 27 | ||
26 | SRCREV = "563ce3888f3c04abcc96ba236b20c7a822bc88e2" | 28 | SRCREV = "5e3bd5cb28e7af95b289a617ca2f7a8892498225" |
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch index c57943d9..ad2b489d 100644 --- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d5faf29f8a41b0e28132fb23828cff8043174cb8 Mon Sep 17 00:00:00 2001 | 1 | From 00bb7694b9287f23d4d059ae134e9409db69673e Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Thu, 31 Mar 2016 19:57:01 -0400 | 3 | Date: Thu, 31 Mar 2016 19:57:01 -0400 |
4 | Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' | 4 | Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' |
@@ -11,10 +11,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
11 | 1 file changed, 1 insertion(+) | 11 | 1 file changed, 1 insertion(+) |
12 | 12 | ||
13 | diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp | 13 | diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp |
14 | index 2e03f74..3d1b3c8 100644 | 14 | index bdecf5b..811a761 100644 |
15 | --- a/examples/quick/controls/texteditor/src/documenthandler.cpp | 15 | --- a/examples/quick/controls/texteditor/src/documenthandler.cpp |
16 | +++ b/examples/quick/controls/texteditor/src/documenthandler.cpp | 16 | +++ b/examples/quick/controls/texteditor/src/documenthandler.cpp |
17 | @@ -44,6 +44,7 @@ | 17 | @@ -54,6 +54,7 @@ |
18 | #include <QtGui/QTextCursor> | 18 | #include <QtGui/QTextCursor> |
19 | #include <QtGui/QFontDatabase> | 19 | #include <QtGui/QFontDatabase> |
20 | #include <QtCore/QFileInfo> | 20 | #include <QtCore/QFileInfo> |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 0ebf4fd5..00fe4fc9 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" | 11 | DEPENDS += "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "ac152bfcd37f94453e9705b57ca6520ad30bade0" | 13 | SRCREV = "2a5c64a1ddf5b6fdb9104faf99260925a327b2f4" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 7a5ca233..9231a79c 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ SRC_URI += " \ | |||
17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | 17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "01e52200e2a76ec51c3bb9710617ac0c249a78bc" | 20 | SRCREV = "3411c3579fb9e767c819c0c8d9f35c52c9964b06" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 565ca843..7859ec53 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" | |||
27 | 27 | ||
28 | DEPENDS += "qtbase" | 28 | DEPENDS += "qtbase" |
29 | 29 | ||
30 | SRCREV = "b16873afea798d08799d7a0b255b8d200337f35b" | 30 | SRCREV = "b49bfdaad11be1de632f907d43485a7ac701ddc5" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 16c20956..1098f25e 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase qtdeclarative" | 16 | DEPENDS += "qtbase qtdeclarative" |
17 | 17 | ||
18 | SRCREV = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e" | 18 | SRCREV = "33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 4139db1f..b16978ba 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "9a70ee2389d3302f6a4262325f8a76e4d867b478" | 18 | SRCREV = "84feab670cce8414ad54f4d19b46291c7fdb14cf" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 6c300e5b..09fef6ca 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "e02df9c098b4d304b34c0ff65806a0576e45ed1a" | 16 | SRCREV = "612c3041475550837dee7149b9f5e9e4f55c17a0" |
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 8cbe0e0c..a467f998 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb | |||
@@ -30,7 +30,4 @@ do_install_append() { | |||
30 | 30 | ||
31 | QT_MODULE_BRANCH = "dev" | 31 | QT_MODULE_BRANCH = "dev" |
32 | 32 | ||
33 | # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 | ||
34 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6 | ||
35 | |||
36 | SRCREV = "236b6b544fd2049eb46e8f79d13bb7aa35ba002f" | 33 | SRCREV = "236b6b544fd2049eb46e8f79d13bb7aa35ba002f" |
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index dbb94381..8cf6adae 100644 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c6d62fcf2e02b5a86c36b4afd78dfb7a3f29ad91 Mon Sep 17 00:00:00 2001 | 1 | From e80743f15443212823e95d2be82073980a4700bc Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.jansa@gmail.com> | 2 | From: Martin Jansa <Martin.jansa@gmail.com> |
3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 | 3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 |
4 | Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert |
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch index b5e92934..fe8fe3d7 100644 --- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 34f23c43f1c656ccd424528821a9ac65a98c5fec Mon Sep 17 00:00:00 2001 | 1 | From d7943b08bdb858bd2501c93a428ebc13bc9f3cfc Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 | 3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 |
4 | Subject: [PATCH] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH] assistant/help: fix linking of dependent libraries |
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index f0f40b7a..aca2fbce 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b77f225e25360832074692681c5ff7c13862102d Mon Sep 17 00:00:00 2001 | 1 | From 6c5bbd423c3c8f87d00c18384460ab418dccea95 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH] add noqtwebkit configuration | 4 | Subject: [PATCH] add noqtwebkit configuration |
diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch index 16ff71e4..4f599805 100644 --- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e65c5ea9f7ce6fade201ed15b44dcb4d82219b3f Mon Sep 17 00:00:00 2001 | 1 | From 3dfe38ac9b83ee94c8abfe1bb78b14050b0c9a6f Mon Sep 17 00:00:00 2001 |
2 | From: Cody P Schafer <dev@codyps.com> | 2 | From: Cody P Schafer <dev@codyps.com> |
3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 | 3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 |
4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for | 4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index e0b23b4b..fbc5a38a 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" | 32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" |
33 | 33 | ||
34 | SRCREV = "e33532e048fa12ee32429ca83ee31aa8f065147d" | 34 | SRCREV = "d36d2c3026cae67c119384f47cb2680552c81aaf" |
35 | 35 | ||
36 | BBCLASSEXTEND = "native nativesdk" | 36 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 93b147d8..70f57bf8 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \ | |||
114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
115 | " | 115 | " |
116 | 116 | ||
117 | SRCREV = "13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0f" | 117 | SRCREV = "745f8d5329d0d6d98a8577a254d2ee3e7174634e" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index ca47da84..505f19b1 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb | |||
@@ -25,4 +25,4 @@ do_install() { | |||
25 | oe_runmake install INSTALL_ROOT=${D} | 25 | oe_runmake install INSTALL_ROOT=${D} |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "26e27845a43319d0ecad0c6392f05d1ed50da2a2" | 28 | SRCREV = "bfa66ccb29f747e2cb07a4f2e561b165be9f211d" |
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch index 45493cf5..c199f712 100644 --- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cadcacf58301251629a63ecd2682d58e6bf24cb8 Mon Sep 17 00:00:00 2001 | 1 | From 4334643f02fc333fa8b633ff614fa4ceecf4a8e6 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 | 3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 |
4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side | 4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side |
diff --git a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch index f39707c6..72f29534 100644 --- a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch +++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52971db84e3b2c429e8777953c0532dcb88b8e6b Mon Sep 17 00:00:00 2001 | 1 | From 3c5c13f2f991cc79363969fb3873d553dd985e7b Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 | 3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 |
4 | Subject: [PATCH] examples/wayland: include server-buffer only when building | 4 | Subject: [PATCH] examples/wayland: include server-buffer only when building |
@@ -14,15 +14,14 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | 14 | 1 file changed, 3 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro | 16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro |
17 | index d633fb9..643c7cd 100644 | 17 | index b67d12e..c5daad0 100644 |
18 | --- a/examples/wayland/wayland.pro | 18 | --- a/examples/wayland/wayland.pro |
19 | +++ b/examples/wayland/wayland.pro | 19 | +++ b/examples/wayland/wayland.pro |
20 | @@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { | 20 | @@ -9,4 +9,6 @@ qtHaveModule(quick) { |
21 | SUBDIRS += qml-compositor | 21 | SUBDIRS += custom-extension |
22 | } | ||
23 | |||
24 | - SUBDIRS += server-buffer | ||
25 | + contains(QT_CONFIG, opengles2) { | ||
26 | + SUBDIRS += server-buffer | ||
27 | + } | ||
28 | } | 22 | } |
23 | |||
24 | -SUBDIRS += server-buffer | ||
25 | +contains(QT_CONFIG, opengles2) { | ||
26 | + SUBDIRS += server-buffer | ||
27 | +} | ||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a1cee864..8f016583 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -36,4 +36,4 @@ SRC_URI += " \ | |||
36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ | 36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV = "26e27845a43319d0ecad0c6392f05d1ed50da2a2" | 39 | SRCREV = "bfa66ccb29f747e2cb07a4f2e561b165be9f211d" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 79c6b23f..869851b1 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtdeclarative qtwebsockets" | 16 | DEPENDS += "qtdeclarative qtwebsockets" |
17 | 17 | ||
18 | SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498" | 18 | SRCREV = "a2c3b32d08ed24279609a8c01b09c1147a9ff6b9" |
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch index 75350c17..5fd3f06a 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 04be78d20ecc23e289e171e907bb5daf9393619d Mon Sep 17 00:00:00 2001 | 1 | From 66af547c2b3ed473b81421aa239d931d364f644d Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 | 3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 |
4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc | 4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc |
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi | 12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi |
13 | index b860735..0ed5de3 100644 | 13 | index 63c3f76..331c975 100644 |
14 | --- a/src/3rdparty/chromium/base/base.gypi | 14 | --- a/src/3rdparty/chromium/base/base.gypi |
15 | +++ b/src/3rdparty/chromium/base/base.gypi | 15 | +++ b/src/3rdparty/chromium/base/base.gypi |
16 | @@ -785,7 +785,7 @@ | 16 | @@ -801,7 +801,7 @@ |
17 | ['include', '^nix/'], | 17 | ['include', '^nix/'], |
18 | ], | 18 | ], |
19 | }], | 19 | }], |
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index c95fad09..287bf2b1 100644 --- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dde0edc1681bb49580584028c2d7b5757e177cd1 Mon Sep 17 00:00:00 2001 | 1 | From d28e6ef9c684a7f8f59995995b5cb5a0b1791ee1 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 | 3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 |
4 | Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | 4 | Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H |
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
13 | index 2df689b..8d984c7 100644 | 13 | index 26db26f..277bf98 100644 |
14 | --- a/tools/qmake/mkspecs/features/functions.prf | 14 | --- a/tools/qmake/mkspecs/features/functions.prf |
15 | +++ b/tools/qmake/mkspecs/features/functions.prf | 15 | +++ b/tools/qmake/mkspecs/features/functions.prf |
16 | @@ -131,9 +131,9 @@ defineReplace(mocOutput) { | 16 | @@ -168,9 +168,9 @@ defineReplace(mocOutput) { |
17 | out = $$1 | 17 | out = $$1 |
18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | 18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one |
19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ | 19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ |
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch index 00432bc0..d5ed1ab7 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3ae00f0217e4a0039f0855ea6cd945209b1734ee Mon Sep 17 00:00:00 2001 | 1 | From e40a18da9631fa21202836caf69b3343e8bae973 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 | 3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 |
4 | Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX | 4 | Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX |
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index 18f268ce..38e97d19 100644 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6576e3135b839b53c422befac0a233f6dd1966bf Mon Sep 17 00:00:00 2001 | 1 | From 9f314e95248795bcce787f88bce77ba6058b34c7 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | 3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 |
4 | Subject: [PATCH] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH] functions.prf: Make sure we only use the file name to |
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 2 insertions(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
14 | index 8d984c7..055e960 100644 | 14 | index 277bf98..d263be4 100644 |
15 | --- a/tools/qmake/mkspecs/features/functions.prf | 15 | --- a/tools/qmake/mkspecs/features/functions.prf |
16 | +++ b/tools/qmake/mkspecs/features/functions.prf | 16 | +++ b/tools/qmake/mkspecs/features/functions.prf |
17 | @@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { | 17 | @@ -165,7 +165,8 @@ defineReplace(findIncludedMocFiles) { |
18 | } | 18 | } |
19 | 19 | ||
20 | defineReplace(mocOutput) { | 20 | defineReplace(mocOutput) { |
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch index 78cb3fc4..e0410638 100644 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f4c64fbabdcc30d46d9181401aa1c9d78fcb0b2f Mon Sep 17 00:00:00 2001 | 1 | From 617028757a9afd334a0938e617429cca78363d69 Mon Sep 17 00:00:00 2001 |
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | 2 | From: Frieder Schrempf <frieder.schrempf@online.de> |
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | 3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 |
4 | Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform |
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
12 | 1 file changed, 6 insertions(+) | 12 | 1 file changed, 6 insertions(+) |
13 | 13 | ||
14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
15 | index 055e960..379c9b5 100644 | 15 | index d263be4..879287a 100644 |
16 | --- a/tools/qmake/mkspecs/features/functions.prf | 16 | --- a/tools/qmake/mkspecs/features/functions.prf |
17 | +++ b/tools/qmake/mkspecs/features/functions.prf | 17 | +++ b/tools/qmake/mkspecs/features/functions.prf |
18 | @@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { | 18 | @@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { |
diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index 901462cd..0a708aff 100644 --- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a2670f5ad67822b399e9dd7b3b87589be1da9749 Mon Sep 17 00:00:00 2001 | 1 | From d084661f50dbdc6a4014f9a2181462bba770437f Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 | 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 |
4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor | 4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor |
@@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | |||
9 | 1 file changed, 2 insertions(+) | 9 | 1 file changed, 2 insertions(+) |
10 | 10 | ||
11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h | 11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h |
12 | index 65bf25e..0447d07 100644 | 12 | index 892e99c..a4429d5 100644 |
13 | --- a/src/webengine/api/qquickwebengineview_p_p.h | 13 | --- a/src/webengine/api/qquickwebengineview_p_p.h |
14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h | 14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h |
15 | @@ -56,6 +56,8 @@ | 15 | @@ -60,6 +60,8 @@ |
16 | #include <QString> | 16 | #include <QString> |
17 | #include <QtCore/qcompilerdetection.h> | 17 | #include <QtCore/qcompilerdetection.h> |
18 | #include <QtGui/qaccessibleobject.h> | 18 | #include <QtGui/qaccessibleobject.h> |
diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch index fa3faf45..3a97a4ae 100644 --- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b523c4dd76f6205389d8f5771124f0451ec7183f Mon Sep 17 00:00:00 2001 | 1 | From 0999fbfe32480e737f23ed8fce8f35897b97c20a Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 | 3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 |
4 | Subject: [PATCH] Include dependency to QCoreApplication::translate() | 4 | Subject: [PATCH] Include dependency to QCoreApplication::translate() |
@@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | |||
9 | 1 file changed, 2 insertions(+) | 9 | 1 file changed, 2 insertions(+) |
10 | 10 | ||
11 | diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h | 11 | diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h |
12 | index 500fe76..eda2824 100644 | 12 | index b13a9da..8a54cce 100644 |
13 | --- a/src/core/media_capture_devices_dispatcher.h | 13 | --- a/src/core/media_capture_devices_dispatcher.h |
14 | +++ b/src/core/media_capture_devices_dispatcher.h | 14 | +++ b/src/core/media_capture_devices_dispatcher.h |
15 | @@ -43,6 +43,8 @@ | 15 | @@ -46,6 +46,8 @@ |
16 | #include <map> | 16 | #include <map> |
17 | #include <QtCore/qcompilerdetection.h> | 17 | #include <QtCore/qcompilerdetection.h> |
18 | 18 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 427cd958..48c955cc 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -1,12 +1,15 @@ | |||
1 | SUMMARY = "QtWebEngine combines the power of Chromium and Qt" | 1 | SUMMARY = "QtWebEngine combines the power of Chromium and Qt" |
2 | 2 | ||
3 | LICENSE = "LGPL-3.0 & BSD" | 3 | # Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ |
4 | LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0" | ||
4 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
5 | file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \ | 6 | file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \ |
6 | file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ | 7 | file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ |
7 | file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ | 8 | file://LICENSE.LGPL3;md5=3dcffeed712d3c916f9a2d9135703aff \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ |
9 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
12 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
10 | " | 13 | " |
11 | 14 | ||
12 | DEPENDS += " \ | 15 | DEPENDS += " \ |
@@ -106,7 +109,7 @@ RDEPENDS_${PN}-examples += " \ | |||
106 | qtdeclarative-qmlplugins \ | 109 | qtdeclarative-qmlplugins \ |
107 | " | 110 | " |
108 | 111 | ||
109 | QT_MODULE_BRANCH_CHROMIUM = "45-based" | 112 | QT_MODULE_BRANCH_CHROMIUM = "49-based" |
110 | 113 | ||
111 | SRC_URI += " \ | 114 | SRC_URI += " \ |
112 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ | 115 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ |
@@ -119,8 +122,8 @@ SRC_URI += " \ | |||
119 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 122 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
120 | " | 123 | " |
121 | 124 | ||
122 | SRCREV_qtwebengine = "643aa579fc94933eefa8eb20af6729e2140cf480" | 125 | SRCREV_qtwebengine = "63cf26268996ae5580c77095a252696fa549b593" |
123 | SRCREV_chromium = "8252b18aa3efa52138e91f9756945afb142a1c8c" | 126 | SRCREV_chromium = "ba40ed24a6d23e606397b650a7982b0998dbeaf4" |
124 | SRCREV = "${SRCREV_qtwebengine}" | 127 | SRCREV = "${SRCREV_qtwebengine}" |
125 | 128 | ||
126 | SRCREV_FORMAT = "qtwebengine_chromium" | 129 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 933220de..0920f260 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -19,4 +19,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" | |||
19 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 19 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
20 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 20 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
21 | 21 | ||
22 | SRCREV = "1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34" | 22 | SRCREV = "f3f9e2a1b772b718335331a603a6bee748928e49" |
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index 1f3dd2a7..d96636e6 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3e321803386278c52508d114f5096883e974a4bb Mon Sep 17 00:00:00 2001 | 1 | From 86bdd059606252b16c24432fbe4bba461406c1e4 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Woerner <trevor.woerner@linaro.org> | 2 | From: Trevor Woerner <trevor.woerner@linaro.org> |
3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 | 3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 |
4 | Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) | 4 | Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) |
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch index 2114b42c..d7627ec2 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f1eb41ada1a9bb5f4073c8a48010555cbefeec34 Mon Sep 17 00:00:00 2001 | 1 | From f6989fec34f0bafdeda549d71751f236ef1f3b96 Mon Sep 17 00:00:00 2001 |
2 | From: Magnus Granberg <zorry@gentoo.org> | 2 | From: Magnus Granberg <zorry@gentoo.org> |
3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 | 3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 |
4 | Subject: [PATCH] Remove TEXTREL tag in x86 | 4 | Subject: [PATCH] Remove TEXTREL tag in x86 |
diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch index 5edc9392..a16801b5 100644 --- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5e5545f49d91e1c40d85d2497e16495ee9e53c11 Mon Sep 17 00:00:00 2001 | 1 | From ed626df67e8287fadbfe2801c241c9717472dcf4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 5 Jun 2015 19:55:05 -0700 | 3 | Date: Fri, 5 Jun 2015 19:55:05 -0700 |
4 | Subject: [PATCH] Exclude backtrace() API for non-glibc libraries | 4 | Subject: [PATCH] Exclude backtrace() API for non-glibc libraries |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index eb05ce24..22efe82b 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -71,4 +71,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db | |||
71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
73 | 73 | ||
74 | SRCREV = "71136c9621103522e85654c8e144d5f1c961de1c" | 74 | SRCREV = "2e8517924b70a778463e463873eb3d8d0b623eed" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 66d9d741..282ae986 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 = "ba9306ec5a1271275d79b2f48ceb227f79352f33" | 14 | SRCREV = "00156d63eea2fb7681a8a00a3144392d6325e5cb" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index d8beb500..e4228177 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "f27489d66cc6d8263130451c26c7e4ae40acc6b4" | 16 | SRCREV = "b414120c60ef8c3cc2aad7dca41092647d741a36" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d78df146..33cedd63 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "5e6acdb2ea92add793835561e7a2d6b0ed8890f8" | 16 | SRCREV = "fb1dc19bf195c530b7f44d18cc927472b9866a46" |
17 | 17 | ||
18 | BBCLASSEXTEND =+ "native nativesdk" | 18 | BBCLASSEXTEND =+ "native nativesdk" |