lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 09:46:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,063 Commits 120 Branches 272 Tags
4d99fb00cc49171facd3cf9fe379428a8c8fed13
Commit Graph

4063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
cb8e769cf6 Update submodules on '5.13' in qt/qt5 
Change-Id: I2c212ec01df2fa67cad4d9e84988d0b31678e6fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-26 07:13:56 +02:00
Qt Submodule Update Bot
d1a81a8e1c Update submodules on '5.14' in qt/qt5 
Change-Id: I15e5942e323d9315fc92d3a907106367f7710d09
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-26 06:13:53 +02:00
Qt Submodule Update Bot
a21de5f32a Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I10025657bc7887680bfc442be6d1ce5f4dc920f8
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-25 15:33:18 +00:00
Liang Qi
1605059e87 platform_configs: remove CMAKE_VERBOSE_MAKEFILE option 
which is not in use when ninja got selected.

Change-Id: I1841471dee0f58e4a54cd05f33f4ba7c3a1a8251
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-25 10:54:34 +00:00
Qt Submodule Update Bot
ad2113fd23 Update submodules on '5.14' in qt/qt5 
Change-Id: Ia3abeacaa4604fecfa0024e1db901d08510d60c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-25 09:23:23 +02:00
Qt Submodule Update Bot
29376716fd Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ib983c826d9a62d0ca506fb238c4e08981729a211
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-25 05:08:07 +00:00
Qt Submodule Update Bot
41ef5a706d Update submodules on '5.13' in qt/qt5 
Change-Id: I239abc4de7cec9c5366d177933a4b16c85067971
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-24 23:31:06 +02:00
The Qt Project
dc22e0dba7 Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake 2019-09-24 16:50:50 +00:00
Jani Heikkinen
2cec2c5f8c Add build for combined android targets 
From 5.14 -> android builds are done by default at one go. Add new builds
for doing that.

Removing old, separate builds will be removed in a follow-up patch to
give time for packaging to adapt that new system

Change-Id: I42f094c7940f3914d7e00feda71cc74f7a26655f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
 2019-09-24 12:08:17 +03:00
Qt Submodule Update Bot
f60588ee72 Update submodules on '5.14' in qt/qt5 
Change-Id: I2a4d65f7cd94f3a6ce7036f20b8a545a160434d8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-24 10:57:29 +02:00
Qt Submodule Update Bot
1760acb17d Update submodules on '5.13' in qt/qt5 
Change-Id: I5405348497e527dc5b4b1ff411736ffebeedb246
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-24 10:06:00 +02:00
Qt Submodule Update Bot
9bc8a3e458 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Iff018927681934d6bf06271d5a2d3ad8008bbcc3
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-24 07:30:37 +00:00
Qt Submodule Update Bot
00bafec768 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I8f67a3299fc118d337141ad680507015e41e31d4
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-23 15:37:00 +00:00
Liang Qi
44073f5563 Merge remote-tracking branch 'origin/dev' into wip/cmake 
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt

Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
 2019-09-23 16:38:06 +02:00
Liang Qi
3b335077f7 Update submodules on '5.14' in qt/qt5 
Change-Id: Ic0e53050e8a7c0928e0ca9ee17f30a303957ea84
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.14.0-alpha1 		2019-09-23 12:31:09 +02:00
Qt Submodule Update Bot
a4ca20dfce Update submodules on '5.13' in qt/qt5 
Change-Id: I75182fb8b231e3086a77c1778320cf0f2590cf92
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-22 12:58:05 +02:00
Qt Submodule Update Bot
709e687c84 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I3a5377e9b1f3365596e25985504342a041371886
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-22 06:50:40 +00:00
Qt Submodule Update Bot
b2fe8b2f09 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: If30c3b1b176d07ad273205f3f7b9a9fa30cae4f6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-21 04:26:39 +00:00
Qt Submodule Update Bot
5d3b2413d0 Update submodules on '5.13' in qt/qt5 
Change-Id: Id1259c1907605ad33cbe7f3be3041b26c01f3387
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-20 09:32:54 +02:00
Qt Submodule Update Bot
48d218a86f Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ie505de6df9bf42d96f4dec88ecedb1347f74f401
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-20 06:13:19 +00:00
Simon Hausmann
5c1656826b Add qtserialport to qt5 
The module has received its initial port

Change-Id: Ie5814be1f52965cb2393ec331e12751472890abc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-09-19 14:42:13 +00:00
Qt Submodule Update Bot
5560b7eced Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ie983c915a2cc472c87b02934700a7219c2b0b359
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-19 13:20:57 +00:00
Qt Submodule Update Bot
de26b29c33 Update submodules on '5.13' in qt/qt5 
Change-Id: I42016698eb34b06de2ef9ee268b4b59e9af38f54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-18 07:34:15 +02:00
Simon Hausmann
fd87ff83aa Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev" 2019-09-17 13:28:52 +02:00
Simon Hausmann
91108b602f Merge remote-tracking branch 'origin/wip/qt6' into dev 
Change-Id: I46d0ce36d9168a0a2fe2229ff94fc6e4a82b5308
 2019-09-17 13:08:12 +02:00
Assam Boudjelthia
ddc99482eb Cherry-pick a QEMU fix for "core dumped" during tests 
Task-number: QTBUG-63152
Change-Id: Iac803ca67537eeb9085fb87625103fdde0bfd904
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-09-17 11:57:28 +03:00
Heikki Halmet
0cf3fdabe3 Provisioning: Upgrade Python pip version for Windows machines 
Task-number: QTQAINFRA-2564
Change-Id: I10402bb3169b483c71e44db7ecba443eb4f46dc1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-17 08:57:18 +00:00
Heikki Halmet
a3136bdbfe Provisioning: Disable or delete unneeded tasks and services 
Windows have lot's of tasks and services running which are slowing
the performance of build machine. Also 'windows' and 'windows
defender' updates need's to be "permanently" disabled.

Task-number: QTQAINFRA-3182
Change-Id: I8f6b237fcdc6e38fa9a06836d349821d86c58afc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-09-17 11:57:11 +03:00
Liang Qi
e62df66bac Update submodules on '5.14' in qt/qt5 
Change-Id: Ic4dacbe6f7f964d10b1cd5569ddf933c0f638126
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-17 08:02:58 +02:00
Liang Qi
c22758cc1e Merge "Merge remote-tracking branch 'origin/5.13' into 5.14" 2019-09-17 08:02:50 +02:00
Simon Hausmann
afa801cd31 Re-add QtWebSockets 
Maurice ported the module and we can add it to the Qt5 set now.

Change-Id: I146e60f6f18dcf7a00775e532e715e3718644edc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-16 15:18:13 +00:00
Qt Submodule Update Bot
5df688ef3a Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I4464812c569599cad5d6d4a2b2cce0c628799b81
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-14 05:01:07 +00:00
Qt Submodule Update Bot
d696902904 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I210881714fd91a65d8016198c9b23c382d69494c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-13 14:49:27 +00:00
Liang Qi
b2febbfbc7 Update submodules on 'wip/qt6' in qt5 
Only qtmultimedia and qtwebengine in this round.

Change-Id: I82a7b1db76aa0074cd42eeaea96e4e0e4539a564
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-13 14:05:59 +02:00
Liang Qi
a2151b9c7f Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6" 2019-09-13 14:05:49 +02:00
Liang Qi
14d2852597 Merge remote-tracking branch 'origin/dev' into wip/qt6 
Conflicts:
	.gitmodules
		Ignore qtquick3d for now.
	coin/platform_configs/default.txt
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.txt
	coin/platform_configs/qtbase.yaml
		We use yaml files for configurations now.
		Adjust the configurations for Qt6 as it was
		    done before in the .txt files.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9
 2019-09-13 14:04:47 +02:00
Liang Qi
01ad208333 Merge remote-tracking branch 'origin/5.13' into 5.14 
This change partially reverts 24f0367a60.

 Conflicts:
	coin/platform_configs/default.yaml
		SLES 12 got removed temporarily.

Task-number: QTQAINFRA-2851
Change-Id: Ib12a6e5ced3c89a5c8c9c2b1548a1c9d23d159d9
 2019-09-13 13:04:25 +02:00
Qt Submodule Update Bot
b83b16277d Update submodules on '5.13' in qt/qt5 
Change-Id: Icc4380912fc6d1cbb35b2282c37a180641186f60
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-13 10:55:14 +02:00
Heikki Halmet
fa03dbce1f Platform configurations: Move Android_ANY (clang-x86) to default 
Arm targets from default change places with clang-x86 from qt5

Task-number: QTQAINFRA-3153
Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-09-12 20:51:28 +03:00
Qt Submodule Update Bot
6762ccb186 Update submodules on '5.14' in qt5 
Change-Id: Ib6d7eb8b580702724369ac7c81df16688b2b87ec
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-12 11:40:43 +02:00
Qt Submodule Update Bot
39a9e58888 Update submodules on '5.13' in qt5 
Change-Id: I07251a5915fb85153fb81d05dc16c7ed8eba5dcf
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-12 06:16:17 +02:00
Qt Submodule Update Bot
bcdfcd2668 Update submodules on '5.13' in qt5 
Change-Id: Id18e857d3312854344f5ffa01cf7666107803a0b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-11 09:03:16 +02:00
Liang Qi
677412dcbe Move the developer build from static suse to ubuntu 
Because we don't run tests on static build.

Change-Id: I10c7851ecebcfa3691690c6bc26a352fd5799965
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-11 05:56:37 +00:00
Qt Submodule Update Bot
7e78bd1efd Update submodules on '5.14' in qt5 
Change-Id: Ifa16f5ec4558b490dd775598b269ef6699cceb91
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-10 21:49:51 +02:00
Qt Submodule Update Bot
c62fcdea06 Update submodules on 'wip/cmake' in qt5 
Change-Id: I37d9b32566af41419e1bb64c0cf94c66fb3e6c4f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-10 14:24:29 +00:00
Assam Boudjelthia
d8a384f03f Provisioning: Use correct sysroot path for QEMU armv7 in qtdeclarative 
Task-number: QTQAINFRA-2808
Change-Id: Ia0caf7003a5bd67dc220f0a3a1da06646ca6b657
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-09-10 10:49:01 +03:00
Qt Submodule Update Bot
4909f4a765 Update submodules on '5.13' in qt5 
Change-Id: I201b65701b7f9f58422ba1bcdbd42c6278d9e604
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-10 09:48:47 +02:00
Liang Qi
66ea34668a Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-09-10 09:48:42 +02:00
Liang Qi
8c00a4f011 Add webAssembly build for windows again 
This reverts commit 9a8fb868ec
partially.

See also 38e416be66.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Change-Id: I6a63c2c437bd1568d88ffae0b565b99c15188770
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-10 06:13:18 +02:00
Liang Qi
bbc7794b64 Update submodules on '5.14' in qt5 
Change-Id: I98f238f0dbe8cb3537808457b448c7e61ac533a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-10 06:13:09 +02:00