lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-03 15:06:25 +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
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
Allan Sandfeld Jensen
ca914bdbf3 Fix qtwebwengine.yaml 
Missing an initial separator

Change-Id: I1f447963fbaa93027cfffd7c320efc69ea4a1107
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-21 16:46:47 +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
Allan Sandfeld Jensen
9b7a95964d Add qtwebengine.yaml 
We can't build the wasm version of qtbase any longer

Change-Id: I7436640941702ba2479c7e73f3d1d9ccaf2e7709
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-21 10:02:36 +02:00
Volker Hilsheimer
82ed571cde Add Pick-to footer for cherry-pick bot to commit template 
Change-Id: Idec00573bdbebda4d3b3481eee480c91c5d8d1de
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2020-04-20 11:04:27 +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
Qt Submodule Update Bot
606bbd68c4 Update submodules on '5.14' in qt/qt5 
Change-Id: Ic9e8123184a04c43ad06aee8cabc2f97006ca694
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-10 22:31:14 +02:00
Heikki Halmet
5148639647 Provisioning: Activate subscriptions 
Task-number: QTQAINFRA-3638
Change-Id: Ide5599a45b918dcbd44a7d60a78c3a4811d80943
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-04-09 14:08:24 +03:00
Qt Submodule Update Bot
f63b095561 Update submodules on 'dev' in qt/qt5 
Change-Id: Ie35c05cb101d3a5e44ec2fbe5cb8bad2e16f785a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2020-04-09 08:08:51 +02:00
Qt Submodule Update Bot
93f50f13fe Update submodules on 'dev' in qt/qt5 
Change-Id: I67165031f648c6e4f662e832635c4e55265a0c5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-09 00:00:09 +02:00
Qt Submodule Update Bot
2c10dd3510 Update submodules on '5.15' in qt/qt5 
Change-Id: I820f8ebf9e428fe2b71b0aa64e5c6aeca744b82e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-08 23:46:27 +02:00
Qt Submodule Update Bot
26526c4560 Update submodules on '5.14' in qt/qt5 
Change-Id: I4c3ec2af33f0fccb8b5864340ba27187028f8a1d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-08 22:31:17 +02:00
Qt Submodule Update Bot
ae846322ea Update submodules on 'dev' in qt/qt5 
Change-Id: Ib9c73befcbb68f5dbf4abb8931bfee41827c8e05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-08 00:00:23 +02:00
Alexandru Croitor
da26e954de CMake: Pass location to custom OpenSSL 1.1 directory in Coin 
Needed for enabling all the various OpenSSL classes in Qt.

Change-Id: Ic20ab464552317a2753ae0e35043e16cc6c60ab3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
 2020-04-07 17:42:51 +02:00
Qt Submodule Update Bot
d241778ce9 Update submodules on 'dev' in qt/qt5 
Change-Id: I915cc1d265b84df6bf8b01012f8ff4e37a1c0860
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2020-04-07 15:16:07 +02:00
Alexandru Croitor
a86d895287 CMake: Enable CMake builds for qt5compat 
Change-Id: I939f42e03cb76ccf8d984ee0f856c44049679794
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2020-04-07 14:09:09 +02:00
Qt Submodule Update Bot
be31c59312 Update submodules on '5.15' in qt/qt5 
Change-Id: I831f980c63a715420a664171546fad03667862bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-07 06:33:32 +02:00
Qt Submodule Update Bot
06f9c8cc3a Update submodules on 'dev' in qt/qt5 
Change-Id: I96c17784a1c9cf24552a68de4e3995095fb14999
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-04 23:59:58 +02:00
Qt Submodule Update Bot
861e942481 Update submodules on '5.14' in qt/qt5 
Change-Id: Ib6d80439b2c9dca1c76c0810769d991db8ee3d58
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-04 22:31:38 +02:00
Heikki Halmet
8101b54714 Provisioning: Update Windows 10 x86_64 to version 1909 
These are also updated to tier1 image:
msvc 2017: Not installed
msvc 2019: version 16.4.4
msvc 2019 build tools: version 16.4.4

Task-number: QTQAINFRA-3623
Task-number: QTQAINFRA-3417
Change-Id: I006204ca090c4e2cf0d2ffc2309ab6b94f9b7d47
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
v5.15.0-beta3 		2020-04-04 17:13:43 +03:00
Lorn Potter
f5862a11f4 Provisioning: Bump emscripten version to 1.39.8 on Windows 
(cherry picked from commit 939c014039)

Task-number: QTQAINFRA-3577
Change-Id: I5842158c0a11b29791fcb97d4523467de899e1e2
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-04 08:15:38 +02:00
Morten Johan Sørvig
922cca96bf Provisioning: Bump Emscripten version to 1.39.8 
(cherry picked from commit 10e843566e)

The upstream URLs have changed:
 - emscripten packages now at github.com/emscripten-core/emscripten/archive/
 - binaries (llvm/binaryen/node) now at storage.googleapis.com/webassembly/emscripten-releases-builds/

Add support for unpacking tbz2 files. Keep caching as
before, update .emscripten config file with new paths.

Task-number: QTQAINFRA-3577
Change-Id: I239aaf89bc199e5f6267519861f9b2ab54f10b0f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-04 08:15:13 +02:00
Qt Submodule Update Bot
b6f12a0c33 Update submodules on 'dev' in qt/qt5 
Change-Id: If5d70aa1a51eb7b8481cae5659e7cd2d9d66d45c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-04 03:23:30 +02:00
Qt Submodule Update Bot
38f80e73f6 Update submodules on 'dev' in qt/qt5 
Change-Id: I8d07db2c521517a5770fae17dbda59abb5510019
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2020-04-03 22:04:30 +02:00
Qt Submodule Update Bot
c63db0ef02 Update submodules on 'dev' in qt/qt5 
Change-Id: I1c2002fdb706af67581b2030119c894db89dcc24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-03 00:00:30 +02:00
Qt Submodule Update Bot
941c3e487f Update submodules on 'dev' in qt/qt5 
Change-Id: I6eb97a9587376a9d7bc96933825c2cdde0841197
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2020-04-02 17:29:45 +02:00
Alexandru Croitor
e1a4d6bf17 CMake: Enable CMake builds for qtwayland 
Change-Id: I2f8e762a7e440e1f59591569910a2f68cf0e7c3e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2020-04-02 10:00:33 +02:00
Qt Submodule Update Bot
e94816937f Update submodules on 'dev' in qt/qt5 
Change-Id: Iaf5efa53ddb01205d73bd6bf37f06e62abffa39c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-02 00:00:06 +02:00
Qt Submodule Update Bot
b3f626f83d Update submodules on '5.15' in qt/qt5 
Change-Id: Ibb6f659e59b861066d1e2b0c3e11574785268b93
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-01 23:45:55 +02:00
Lars Knoll
a3e33df7f6 Completely remove QtScript from qt5.git 
It doesn't even compile against c++17 anymore (uses auto_ptr),
and the JavaScript engine is now more than 10 years outdated.

Change-Id: I56cc36aa5aeb4dfa6b19b699886f6e34fe1eecbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2020-04-01 22:36:01 +02:00
Qt Submodule Update Bot
81ab1ffb89 Update submodules on '5.14' in qt/qt5 
Change-Id: I1f9e9a31a313577ddb9325b9485f26dc782e4284
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-01 22:31:15 +02:00
Qt Submodule Update Bot
3a64559f68 Update submodules on 'dev' in qt/qt5 
Change-Id: Iea05dbac28cd0c96da47ac2647c65ba3c9639d79
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-01 00:00:10 +02:00
Qt Submodule Update Bot
a9d743de49 Update submodules on 'dev' in qt/qt5 
Change-Id: I696f0591917930f910c50833601d482b70f2a2d1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2020-03-31 14:42:51 +02:00