lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,502 Commits 118 Branches 270 Tags
5a642020c3ca3ff1946bfd80e3e2ce2fa2af3901
Commit Graph

4502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
5a642020c3 Update submodules on '6.0' in qt/qt5 
Change-Id: I7134ea8c8cce3b127337725245f12b5f9323b801
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-31 08:02:22 +03:00
Heikki Halmet
af56103607 Provisioning: Upgrade Xcode to version 12.4 for macOS 10.15 and 11.0 
Task-number: QTQAINFRA-4230
Change-Id: Id3de8771e18da5d40cf62ad501a23fce89e845c4
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 7a027b4dfd)
 2021-03-30 15:22:23 +03:00
Qt Submodule Update Bot
31ff39ab7b Update submodules on '6.0' in qt/qt5 
Change-Id: Ib6f70844608788752db228e93d1f8e190772f1d8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-30 09:59:47 +03:00
Qt Submodule Update Bot
9f5f381673 Update submodules on '6.0' in qt/qt5 
Change-Id: Iba76968d0845b67082705a6fe523407d03c2ba41
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-29 08:29:45 +03:00
Johanna Äijälä
ba6d7235a1 Provisioning: update Squish packges 
Still using unreleased custom snapshot packages from Froglogic.
macOS: use custom build Qt5.15 package with separate Squish server
adjusted for Qt6.

Change-Id: I8605204118015feb347268c335ef731ff99e3c68
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 02d4c34b7d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-03-28 15:29:03 +00:00
Heikki Halmet
2e88845015 Provisioning: Install GCC toolset for CentOS 
GCC toolset provides upgraded GCC version for CentOS.

Change-Id: Ia62c7abf21eeed5d65c6b2e35fe1013d839cfa24
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 066964d275)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-03-26 17:15:49 +00:00
Qt Submodule Update Bot
62efea7477 Update submodules on '6.0' in qt/qt5 
Change-Id: I361b0238a67f8522430bd9e4da153d16e88d1671
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-26 15:35:57 +02:00
Qt Submodule Update Bot
b021c416b5 Update submodules on '6.0' in qt/qt5 
Change-Id: Ifff28ca8c055f02e19818be673b962aca7cdbf3f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.0.3 		2021-03-26 06:23:45 +02:00
Paul Wicking
55273d6cc0 Update documentation for init-repository 
There's no mention of additionalLibrary status.

Change-Id: I3ebf8fdc6dcfc01392b1ab5a42734cef81d6fc61
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit ed139ea47e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-03-25 18:19:14 +00:00
Qt Submodule Update Bot
7aa86c0924 Update submodules on '6.0' in qt/qt5 
Change-Id: Ic13adf9282cea81f8fd00187cf343bf33994243b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-24 07:18:34 +02:00
Qt Submodule Update Bot
ea624475d7 Update submodules on '6.0' in qt/qt5 
Change-Id: Ie4614881e3b92023f300cf9e82df6661226b93bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-23 13:29:01 +02:00
Qt Submodule Update Bot
64f08a4607 Update submodules on '6.0' in qt/qt5 
Change-Id: I192cca38ff1deb2fec4e7c5112f5f3427a2ffc42
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-23 03:01:20 +02:00
Qt Submodule Update Bot
e3ef111eae Update submodules on '6.0' in qt/qt5 
Change-Id: Id619a45a77efda40079bd172da5b92cfe24405f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-22 17:59:38 +02:00
Qt Submodule Update Bot
f97f0edc10 Update submodules on '6.0' in qt/qt5 
Change-Id: I6168a62d97c3ae1e2d4d1063e9f77a96e6ca1d9b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-22 07:30:06 +02:00
Qt Submodule Update Bot
9d021a4170 Update submodules on '6.0' in qt/qt5 
Change-Id: I0f9ae377b375e01767e0b5db1385d37a2ac7d239
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-19 06:32:23 +02:00
Qt Submodule Update Bot
e62979050c Update submodules on '6.0' in qt/qt5 
Change-Id: Id8442e10ef72de96201c1a1ff96b94ecf2e81988
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-18 11:28:41 +02:00
Qt Submodule Update Bot
282de9a961 Update submodules on '6.0' in qt/qt5 
Change-Id: I7d538c58d6b92474c0376b2db670c02c85243705
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-18 05:45:12 +02:00
Qt Submodule Update Bot
987453db68 Update submodules on '6.0' in qt/qt5 
Change-Id: Ica8e1b80990fc5765d1ab9539b1d2a5ea25780e6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-17 10:24:54 +02:00
Qt Submodule Update Bot
04ff839c76 Update submodules on '6.0' in qt/qt5 
Change-Id: I4fdbc53169d9e446f68a9afd01d38c77f7a72178
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-17 05:57:56 +02:00
Qt Submodule Update Bot
3bc11ef32e Update submodules on '6.0' in qt/qt5 
Change-Id: Ib60b526f1119abddc08db9eacb8a13bc67140aa0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-13 03:11:41 +02:00
Qt Submodule Update Bot
a44a53aba2 Update submodules on '6.0' in qt/qt5 
Change-Id: I5a0e81d1050911480176ea8c47d89d9f357f25d3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-12 17:10:03 +02:00
Paul Wicking
6797c35157 Fix init-repository 
Introducing additionalLibrary to .gitmodules
broke init-repository. Add the new state also
here.

Task-number: QTBUG-90669
Change-Id: I3ac9960427ef2fd8fe39b508b69459f4fcf81ca7
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 414165e366)
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
 2021-03-12 09:19:12 +00:00
Qt Submodule Update Bot
9abdbccaf1 Update submodules on '6.0' in qt/qt5 
Change-Id: I3c96114fe38788172dec85558f0dca4d02bdeaf9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-12 09:35:33 +02:00
Qt Submodule Update Bot
e29bd4cb85 Update submodules on '6.0' in qt/qt5 
Change-Id: I3955d571bdc65cdf25ea8fad436a174e03d9698c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-12 04:41:58 +02:00
Qt Submodule Update Bot
38746546d8 Update submodules on '6.0' in qt/qt5 
Change-Id: I847ea44eb219d62db0c9995ce958db63d96caf9f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-12 00:07:20 +02:00
Qt Submodule Update Bot
dafc99a0d7 Update submodules on '6.0' in qt/qt5 
Change-Id: I52d3d5eadfd70b536395707b274fcb1213d50a03
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-11 13:31:43 +02:00
Qt Submodule Update Bot
b40dbab18a Update submodules on '6.0' in qt/qt5 
Change-Id: Ic32b021870b95b11e5052f06719fa51682d2e61d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-09 14:26:24 +02:00
Qt Submodule Update Bot
6e20e9c2b7 Update submodules on '6.0' in qt/qt5 
Change-Id: Ic1753dd735fca577e9eef3259ef86ba34045aac0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-09 07:42:32 +02:00
Qt Submodule Update Bot
b02360baa5 Update submodules on '6.0' in qt/qt5 
Change-Id: If8e2dafdbd5dd5f35597c189c0e35dafff17d0ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-08 09:28:37 +02:00
Jani Heikkinen
42fdb9aa58 Update submodules on '6.0' in qt/qt5 
Change-Id: I0ec016b5f2d690f66933d74501f12338287a2f51
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2021-03-05 06:22:59 +00:00
Qt Submodule Update Bot
b7f2961bb3 Update submodules on '6.0' in qt/qt5 
Change-Id: Ife4c80edbf8615591547ccb48a027c272e1eeabf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-04 11:34:44 +02:00
Qt Submodule Update Bot
872dedd971 Update submodules on '6.0' in qt/qt5 
Change-Id: I502feee6229dca5c48cd930d954a67a02d1cde8a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-04 05:45:12 +02:00
Qt Submodule Update Bot
2caf6349be Update submodules on '6.0' in qt/qt5 
Change-Id: Ie8281ffd56ed6caab105f85afbd0d375db78d28f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-02 09:18:36 +02:00
Qt Submodule Update Bot
2af56dd556 Update submodules on '6.0' in qt/qt5 
Change-Id: I8d70b77128db9575d864414f1c9ea3cdb9c24e7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-01 06:16:50 +02:00
Jani Heikkinen
17abff55d5 Add missing additional libraries in qt5.git 
We are now supporting 'status = additionalLibrary' for submodules. So
add missing additional libraries and update statuses accordingly

Change-Id: I4e87b92e15ec54e965af94af5841cd3a8a8278ef
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
 2021-02-26 10:14:09 +02:00
Topi Reinio
e9ecfdb335 init-repository: Fix incorrect use of 'or' operator 
This fixes the warning 'Useless use of a constant ("qt5") in void
context at ./init-repository line 649.'

Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 8ebf0095c3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-25 16:19:28 +00:00
Heikki Halmet
26bffd2fab Provisioning: Remove squish script call under Windows 10 x86 
RTA don't use squish with Windows 10 x86 in Qt6

Pick-to: dev
Pick-to: 6.1
Change-Id: Ib1c27e53310506f2c91ab8b65404caba8fcfcaf8
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-02-25 14:26:32 +02:00
Qt Submodule Update Bot
2dcb3fea14 Update submodules on '6.0' in qt/qt5 
Change-Id: I6b4e6e1895861099c2695f840d5c9d709829a5da
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-25 10:28:50 +02:00
Qt Submodule Update Bot
46dddf87bc Update submodules on '6.0' in qt/qt5 
Change-Id: I5c50419286749cfbea278fe07929f947ffe1aaa7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.0.2 		2021-02-25 06:10:39 +02:00
Qt Submodule Update Bot
7df463631a Update submodules on '6.0' in qt/qt5 
Change-Id: Ide3b0713a0df4e693129eba2c3729d7ebc8cfbcc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-25 00:28:10 +02:00
Qt Submodule Update Bot
d57ad7e737 Update submodules on '6.0' in qt/qt5 
Change-Id: I0a76b94296ac3b9593e5b7b1f3a8b194d1bf19dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-24 18:43:36 +02:00
Jani Heikkinen
7fc2031212 Drop failing qmake builds from Android 
We are not supporting to build Qt 6.0 with qmake so it is better to
drop these failing targets instead of wasting time to fix the regression.
These targets are already dropped from newer releases so it is OK to
drop them from Qt 6.0 as well

Fixes: QTBUG-91356
Change-Id: Id5cd4c9758ea7375aca72d23b4aa648e8479869d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2021-02-24 15:54:25 +02:00
Qt Submodule Update Bot
a3ee8d931b Update submodules on '6.0' in qt/qt5 
Change-Id: I53c60a9e3b496844bd7a5cb086f7f323b8ac4725
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-19 10:17:31 +02:00
Qt Submodule Update Bot
640e95a284 Update submodules on '6.0' in qt/qt5 
Change-Id: I0ddb1a365114ba043f7d2d051dea7c2985e99069
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-15 11:05:26 +02:00
Qt Submodule Update Bot
35bc8bf666 Update submodules on '6.0' in qt/qt5 
Change-Id: I31fb9746c5c3c1e1cd60e3cd79b1b2e589085578
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-15 05:45:07 +02:00
Topi Reinio
8f899fc8d6 init-repository: Allow 'tqtc-' prefix for qt5 repository 
Change-Id: Ic4b14e4e6efd43e54a241000e090981ce8b6c651
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 6f7f1cd550)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-11 09:57:20 +00:00
Qt Submodule Update Bot
79bc54cba4 Update submodules on '6.0' in qt/qt5 
Change-Id: I4f041f9beb0d5b5a62e6e5129d2a91cd2cd6f26d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-10 11:44:08 +02:00
Qt Submodule Update Bot
35dcd712b4 Update submodules on '6.0' in qt/qt5 
Change-Id: I6fa1f9ac2ae6a416d86852906767e479b066a005
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-10 07:03:14 +02:00
Qt Submodule Update Bot
390ed26579 Update submodules on '6.0' in qt/qt5 
Change-Id: If09d174898031b7bed71e6c2be7d4d730ad26b90
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-09 13:07:12 +02:00
Qt Submodule Update Bot
cbeb5e362b Update submodules on '6.0' in qt/qt5 
Change-Id: Ic118aac957e922a49878209116f207ac5258e09c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-09 06:59:16 +02:00