lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-04 07:26:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,592 Commits 118 Branches 270 Tags
d1601aa0f94de81fe6b1651a2a3f5ce0a52a1ed3
Commit Graph

4592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Qt Submodule Update Bot
8e6a3321df Update submodules on 'wip/cmake' in qt5 
Change-Id: Iac966615b9f25dc4be021d1db59f8c933646231d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-09 19:33:32 +00:00
Liang Qi
1bb7d2d0c9 Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: Iffcf9b199df17a50acf03e29b9deae033396dfcb
 2019-09-09 20:57:09 +02:00
Tuomas Heimonen
d4e3d3cac3 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build 
Add build flag '-no-opengl' to remove xcb from static build
Add build flag '-no-vulkan' to disable vulkan

Task-number: QSR-517
Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
 2019-09-09 16:53:05 +03:00
Qt Submodule Update Bot
6402cb61b8 Update submodules on '5.12' in qt5 
Change-Id: Ia09d245958bf1e24ba9f95e033dc3803d14edab4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-09 08:45:11 +02:00
Heikki Halmet
ad93109d92 Provisioning: Add emsdk to macOS 10.14 
Task-number: QTQAINFRA-3191
Change-Id: I46a72db63966804b33996d8bc3babe50cd2a41dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-09 08:35:24 +03:00
Qt Submodule Update Bot
0c0ed734ef Update submodules on '5.13' in qt5 
Change-Id: I23ec6312d3bb028effe1f60d2266c5bb212050f5
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-08 11:11:40 +02:00
Liang Qi
f76c553d75 Update submodules on '5.15' in qt5 
Change-Id: I9044304787288e600236d0793c1165cfb540b2a7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-07 21:32:01 +02:00
Liang Qi
aceecad75d Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12" 2019-09-07 18:34:12 +02:00
Liang Qi
e56e0f699d Merge remote-tracking branch 'origin/5.12.5' into 5.12 
Change-Id: I693eeef79b21804e2a0871bdd759271f8a97fcb4
 2019-09-07 18:33:02 +02:00
Qt Submodule Update Bot
1d956e93d0 Update submodules on '5.12' in qt5 
Change-Id: I7059a96dccad04c8647443c8b8e13c2ca88fc5b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-07 13:06:51 +02:00
Qt Submodule Update Bot
15b4e146e5 Update submodules on '5.13' in qt5 
Change-Id: Ic653e56614712c8e7dcd5095b8d32f08dea61731
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-07 09:09:30 +02:00
Assam Boudjelthia
d581d86fc5 Provisioning: update QEMU toolchains 
* Update QEMU toolchains to Yocto thud(2.6) release(DC Qt 5.13.0) with
GCC 8.2.0.
* Suppress QEMU "Unsupported syscall" and "Unsupported ioctl" logs,
set environment variable QEMU_SYSCALL_DEBUG to show them.

Task-number: QTQAINFRA-2808
Change-Id: I987353b0f3aff87a02ea3bf96ace8de32d6f557b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-09-07 07:09:24 +00:00
Liang Qi
1eae3c4185 Update submodules on 'dev' in qt5 
Change-Id: I87be62d19a3aee1fae16cdf27fd35ec67e30130d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-07 09:04:49 +02:00
Qt Submodule Update Bot
bd4774f690 Update submodules on 'wip/cmake' in qt5 
Change-Id: I72c047067aee2006aedfb97fa8d7e3fc214ee590
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-07 05:14:59 +00:00
Simon Hausmann
8b7c454d35 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I9ab957cbe9f81f266ec590e9fb8100608f77f55d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-09-06 14:53:22 +00:00
Simon Hausmann
016016b64e Really add qttools to the build 
... and not qtscript accidentally, like in the previous change.

Change-Id: Ic8cd85ef7b149ffee7bc85ffa3fc9075f8a77c1b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-06 13:32:03 +00:00
Simon Hausmann
01b083ca8e Disable qtscript for the cmake build 
The module has not been ported.

Change-Id: I99041e00fb30b2a9799ee3e948f255422bbc6976
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-06 09:23:52 +00:00
Liang Qi
f0a89a32da Update submodules on '5.14' in qt5 
Change-Id: Ice4211fcc08fa25a55d6a5be1b236b3bdc12c9e1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-06 11:06:00 +02:00
Simon Hausmann
f99d5e8b78 Re-enable qttools for use with cmake 
Change-Id: I040b8769af22290a986ccac476f30e7eed78b3e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-06 09:04:50 +00:00
Assam Boudjelthia
0d273deeef Provisioning: Fix version of libiodbc on MacOs 
libiodbc latest version (3.52.13) was automatically installed causing
qt-config-gui to fail build, this installs version 3.52.12.

Task-number: QTQAINFRA-3188
Change-Id: I5b87ff04c2301a5471cc9abfa0849b6073a1bdd4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-09-06 06:05:40 +00:00
Tuomas Heimonen
be97b9ad72 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build 
Add build flag '-no-xcb' to remove xcb from static build

Task-number: QSR-517
Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
 2019-09-06 07:11:51 +03:00