lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-02 03:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,824 Commits 118 Branches 270 Tags
a8e64fec515dd4910b574b23f37e4591e66ca133
Commit Graph

3824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
a8e64fec51 Update submodules on '5.15' in qt/qt5 
Change-Id: I9f93151930b634d7dcccd717d516717ccd2f4ef1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-05-30 08:58:43 +02:00
Liang Qi
c1c44574f6 Merge remote-tracking branch 'origin/5.15.0' into 5.15 
Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh
	coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh
	coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1

Change-Id: Ic7ed52251573824595821c53025323287d60b536
 2020-05-28 10:22:03 +02:00
Qt Submodule Update Bot
9a4fc7074c Update submodules on '5.15' in qt/qt5 
Change-Id: Iaf309cc8b2404cd9a34a6b5b04331a3acc33794f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-27 06:26:07 +02:00
Heikki Halmet
16ca898568 Provisioning: Update QNX7 SDP to include OpenSSL 1.1.1 
Still includes ICU 58

Task-number: QTQAINFRA-3537
Change-Id: I2f532ff32157e09eeec9a2196d075d4ec6347df5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2020-05-22 14:09:47 +03:00
Qt Submodule Update Bot
4f504b9e3f Update submodules on '5.15' in qt/qt5 
Change-Id: I2cc7f7cd47bbf116a3cc01b42c58d0e09162ac3e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-20 23:46:57 +02:00
Qt Submodule Update Bot
cbb4768052 Update submodules on '5.15' in qt/qt5 
Change-Id: Ia54db5b603a3e31c570d1c7e4ab4cd409b9bd53e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-18 23:46:40 +02:00
Qt Submodule Update Bot
f4b02da372 Update submodules on '5.15' in qt/qt5 
Change-Id: I6e5027ff7b70605a77f35b42f07a0e3ad9bb2f12
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-15 12:10:57 +02:00
Tony Sarajärvi
38139878ff Install GCC 10 on SLES 15 
Task-number: QTQAINFRA-3444
Change-Id: Iaf9b3ea5331cfc0b3d19a09f55aa4df1de93fbb2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2020-05-12 16:40:28 +00:00
Qt Submodule Update Bot
bca97664c6 Update submodules on '5.15' in qt/qt5 
Change-Id: Id17a8894c6eb326e68a5cad454ee193fb4b0381e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-12 10:12:31 +02:00
Heikki Halmet
69342bb5b7 Revert "Provisioning: Disable windows defender firewall" 
This reverts commit 48ff0140de.

Reason for revert: QtBase WinRT test qcoreapplication needs mpssvc service to be enabled

Change-Id: I523b668d9d7292aaaf7462585dc03819a3973010
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-05-12 05:42:53 +00:00
Qt Submodule Update Bot
717364e3e1 Update submodules on '5.15.0' in qt/qt5 
Change-Id: I5d348235045f06b87d3cef2752e87bfb5486ab50
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v5.15.0 		2020-05-12 04:06:03 +00:00
Qt Submodule Update Bot
ca2d7b6a5b Update submodules on '5.15' in qt/qt5 
Change-Id: I4d55ef3f569169b96dbc7b88c9bfd877499e0921
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-05-11 12:44:36 +00:00
Qt Submodule Update Bot
d20eaafc5c Update submodules on '5.15.0' in qt/qt5 
Change-Id: I7237b1851b031f6b6ec8e949be1b2326228d379d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.15.0-rc2 		2020-05-09 11:32:43 +00:00
Qt Submodule Update Bot
b3777f0703 Update submodules on '5.15' in qt/qt5 
Change-Id: I77cfc30c6202b776fc20813f5e71162b6f46c04e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-08 23:45:59 +02:00
Qt Submodule Update Bot
d913a868d4 Update submodules on '5.15.0' in qt/qt5 
Change-Id: Ia3881b1668420fed08caf6a4fb8a8b957ac98789
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-05-08 12:12:34 +00:00
Qt Submodule Update Bot
cb2293ae0a Update submodules on '5.15' in qt/qt5 
Change-Id: I4c98f9f6176d4b2c657880ea3d8e106501fc8906
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-07 23:46:03 +02:00
Qt Submodule Update Bot
826d95df85 Update submodules on '5.15' in qt/qt5 
Change-Id: I1d5374eb04e8bb23af1581c4f091503ccc1fe310
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-06 23:46:05 +02:00
Heikki Halmet
48ff0140de Provisioning: Disable windows defender firewall 
Service is still running. It need to be disabled.

Change-Id: I4742f97c93d118a1a98b4107f1597d332c3f1391
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-05-06 14:44:31 +03:00
Qt Submodule Update Bot
e85c0e88cf Update submodules on '5.15' in qt/qt5 
Change-Id: I95cc4f3c7d2b6d745e50c4fe5405527a06423c24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-05 19:53:44 +02:00
Qt Submodule Update Bot
db44923e30 Update submodules on '5.15.0' in qt5 
Change-Id: I9e83c1d5063f0e6013bd1667987cea949e77809a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.15.0-rc1 		2020-05-05 08:30:54 +00:00
Qt Submodule Update Bot
2bc89aec9b Update submodules on '5.15' in qt/qt5 
Change-Id: I9d169c17ce5772771e51bc58463919ed7c8ed0a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-04 23:46:00 +02:00
Liang Qi
9deba571f9 Temporarily disable QNX builds because license expiry issue 
Task-number: QTQAINFRA-3708
Change-Id: I676ad2e519ab527e079648d41a1ff015a2a17657
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-05-04 15:16:19 +02:00
Heikki Halmet
8f653ce4f8 Provisioning: Add sleep before killing gpg-agent in msys installation 
Task-number: QTQAINFRA-3691
Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920
(cherry picked from commit 5f03b84e65)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-05-04 14:42:03 +03:00
Heikki Halmet
71043ca243 Provisioning: Update expired QNX license 
Task-number: QTQAINFRA-3708
Change-Id: Id2d6d10d88fc50c9985014c44df0b1cf51cc3410
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-05-04 14:41:54 +03:00
Qt Submodule Update Bot
e2d2d25a57 Update submodules on '5.15.0' in qt5 
Change-Id: I4e92a9fdd0602c41477345169899623c036e5edb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-04-30 17:43:46 +00:00
Heikki Halmet
5f03b84e65 Provisioning: Add sleep before killing gpg-agent in msys installation 
Task-number: QTQAINFRA-3691
Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2020-04-30 11:05:15 +03:00
Qt Submodule Update Bot
d937578404 Update submodules on '5.15.0' in qt/qt5 
Change-Id: I2fe48b7e734bdf86f159af47cd2b6f613172afa2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-29 12:14:01 +02:00
Qt Submodule Update Bot
20668c9233 Update submodules on '5.15' in qt/qt5 
Change-Id: Ia0fb6c1f5f1ae1dafaf0999fdc7c1cc5ba765bf2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-26 23:45:55 +02:00
Qt Submodule Update Bot
d88858d98b Update submodules on '5.15.0' in qt/qt5 
Change-Id: Id2db92b9b2928ea7452edb313cc673581bf12b35
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-25 08:30:51 +02:00
Qt Submodule Update Bot
230e99400c Update submodules on '5.15' in qt/qt5 
Change-Id: I6dd7a38815ff1bd13b3b8d1c9a4042c3b0981784
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-24 23:46:00 +02:00
Liang Qi
3050559262 Merge remote-tracking branch 'origin/5.15' into 5.15.0 
Conflicts:
	.gitmodules

Change-Id: I72e0314fbc563a2386f2389239b927f57124c511
 2020-04-24 22:34:43 +02:00
Liang Qi
5b018f96af Update submodules on '5.15' in qt/qt5 
Change-Id: I06f83013c085e342e8391a705ba5ecf156bd5159
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-24 15:59:44 +02:00
Liang Qi
cc4fdea014 Merge remote-tracking branch 'origin/5.14' into 5.15 
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsdk.yaml
	coin/platform_configs/tqtc-qt-rta.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
 2020-04-24 15:31:01 +02:00
Qt Submodule Update Bot
ac8b28db57 Update submodules on '5.14' in qt/qt5 
Change-Id: I919625c0e3a2fdd5dea9dab691c9bc96f62161fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-24 09:48:03 +02:00
Liang Qi
882294edc3 Merge remote-tracking branch 'origin/5.14.2' into 5.14 
Conflicts:
	.gitmodules

Change-Id: I950588f85d1b39ba6ce994821db9f340b72fa6d2
 2020-04-23 12:27:46 +02:00
Qt Submodule Update Bot
10e07c7877 Update submodules on '5.14' in qt/qt5 
Change-Id: Ibdc80d4d7abad334e96f6c5d7c602e42a9d1b31f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-23 10:32:55 +02:00
Qt Submodule Update Bot
767711b44a Update submodules on '5.15.0' in qt/qt5 
Change-Id: Iba9ab3074ef49a9060ce594a0d30083891338e28
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-23 08:13:47 +02:00
Qt Submodule Update Bot
285f2c5690 Update submodules on '5.15' in qt/qt5 
Change-Id: I62fa79986a2ccbf3ee4e000f4f767731bf31fd2e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-23 06:02:52 +02:00
Qt Submodule Update Bot
4d435697fa Update submodules on '5.15' in qt/qt5 
Change-Id: I0c4e65146b752463190fc98e9f670c3b00eac283
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-21 23:46:35 +02:00
Qt Submodule Update Bot
133403b829 Update submodules on '5.15' in qt/qt5 
Change-Id: Ic1acfd2ae08a13f88e45e822a34b673e7470aa72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-21 10:57:24 +02:00
Qt Submodule Update Bot
30b0878b18 Update submodules on '5.15' in qt/qt5 
Change-Id: I53ce054fd386e55c6b9b0954c8636716a4ae08b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-17 23:46:29 +02:00
Qt Submodule Update Bot
cafd0f0019 Update submodules on '5.14' in qt/qt5 
Change-Id: Ifdae4eace5516c6b2886560c7c5da46954b8e712
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-17 22:31:06 +02:00
Qt Submodule Update Bot
908afb868a Update submodules on '5.15' in qt/qt5 
Change-Id: I9c627825712c1c2bc196a8e0d3259189aa43d71b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-16 23:46:26 +02:00
Kari Oikarinen
f008144b88 Adjust submodule branches 2020-04-16 09:14:58 +03:00
Qt Submodule Update Bot
4d3751fe3b Update submodules on '5.15' in qt/qt5 
Change-Id: I2229401bd16f8f5a5f99f0b92c1ea29d03a661d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-15 23:46:40 +02:00
Mårten Nordheim
176d9ce09c Don't manually rerun conan Run-Conan-Install 
Modern conan will retry downloads on its own. Change default number of
attempts to 5 for more reliability.

Change-Id: Iafd4845b31c3e5fb296ba0b897cbf2030c412b04
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
v5.15.0-beta4 		2020-04-15 09:53:44 +03:00
Rami Potinkara
08b99e8def qdb building for mac 
Modified qdb.yaml and created and pkgconfig and libusb relates .sh
files so that QDB can be build for Mac OS due to USB Ethernet CDCECM enabling.

Task-number: QTBUG-82531
Change-Id: Ia5f970e5940b7d9116831c8174db0ea1b9231234
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2020-04-15 08:28:12 +03:00
Heikki Halmet
61267a7a78 Provisioning: Remove notifications and warnings from macOS 
Notifications and warnings in UI might affect RTA and autotests results

Change-Id: I447dab3ba839d2c577f633cbf96fc7f3e5fdfe25
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
 2020-04-14 14:21:19 +03:00
Qt Submodule Update Bot
8a5938bd22 Update submodules on '5.15' in qt/qt5 
Change-Id: Ie44a49c9f1d432865b37297323418c0a831b502c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-04-14 10:16:53 +03:00
Heikki Halmet
bb13978b01 Provisioning: Disable Connected User Experiences and Telemetry service 
Task-number: QTQAINFRA-3609
Change-Id: Ie4df9a3b47cf9adcfc0afa1eaf75386e9452fd42
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-04-11 08:33:29 +03:00