lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 18:19:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,171 Commits 120 Branches 272 Tags
2cba97ff973ec2fdb00c19bdc918afcd5e92512c
Commit Graph

5171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
8b634155a9 Update submodules on 'dev' in qt5 
Change-Id: If053c1ae2aba3aefb28d22b84d992f710e7f0321
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-11 07:40:26 +00:00
Liang Qi
3b5c100040 Update submodules on '5.12' in qt5 
Skip qtbase in this round.

Change-Id: Ib718f8343c710c22bb241867bf3b90eb11aabe05
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-10 19:31:52 +00:00
Tony Sarajärvi
89e0159bbc Swap openSUSE 42.3 to 15 
Task-number: QTQAINFRA-2067
Change-Id: I71f79181704d6ce8faac0019f6d7a5016b0ecb5e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-01-10 17:39:51 +00:00
Qt Submodule Update Bot
affeefbbe6 Update submodules on 'dev' in qt5 
Change-Id: I349c81cfd119703e54c3c7f73601f07f3235bbbe
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-10 12:34:56 +00:00
Juha Karjalainen
cfa7877afe Fix provisioning ODBC environmetal variables had : at end 
CPLUS_INCLUDE_PATH and LIBRARY_PATH environmental variables had
 --> : <-- at end of variable. As this adds current dir to search
path this is undesirable and causes bugs.

Change-Id: Ia36c3f3f791f5d506eea15aba6be6d665049a922
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
 2019-01-10 12:32:57 +00:00
Qt Submodule Update Bot
616178cfb2 Update submodules on '5.12.1' in qt5 
Change-Id: I8768b71048a5602b4a716b3a6da8b570f5e8e51a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-10 05:13:22 +00:00
Maurice Kalinowski
56c43a03cd Provisioning: Update Qt OpcUA backends 
- Unified Automation SDK needs to be updated to 1.6x to reflect latest
API changes
- Open62541 is now inside 3rdparty of the Qt OpcUA module. Hence, no
need to provision it.

Change-Id: I96a3764053ca684fa71f9d49e998ebe0ce45a6ae
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
 2019-01-09 09:57:35 +00:00
Simon Hausmann
0b18f12f99 Prospective fix for git lfs installation 
Keys used to sign package repositories tend to have expiry dates and
therefore need to be changed from time to time. Therefore hardcoding
the key we expect here will break (as it does right now) and it's better
to retrieve the expected key via a secure transport.

The old key - per
http://keyserver.ubuntu.com/pks/lookup?search=0xC2E73424D59097AB&op=vindex
- will expire on the 12 of January. That's probably why they changed the
key used to sign the repo before the expiry.

Change-Id: I39d082a6e12731b7eb0a8214a500101ca24f8af4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-01-09 09:56:56 +00:00
Juha Karjalainen
7028ee3184 Fix broken provisioning script DownloadURL.sh 
DownloadURL returns 0 even when alt download fails.

Task-number: QTQAINFRA-2501
Change-Id: Id2fb1e0b4ff12a48b6adb27291f55fc129296233
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
 2019-01-09 09:14:02 +00:00
Qt Submodule Update Bot
463a873edd Update submodules on 'dev' in qt5 
Change-Id: Iec9fa664e9d99a2c4673a9a8c5a1c6124ad2fcc2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-09 08:49:07 +00:00
Qt Submodule Update Bot
ff12741299 Update submodules on '5.12' in qt5 
Change-Id: I438761719f8deceebfc4a77fb660a18c8d6ed00b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-09 05:24:00 +00:00
Qt Submodule Update Bot
5256ac9c60 Update submodules on '5.12.1' in qt5 
Change-Id: I6bfbe10520706d6c93037585b1e78b8b85cd3ea1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-09 05:22:17 +00:00
Liang Qi
0f8243bce8 Adjust submodule branches 
Change-Id: I581af0bcf61605f9cc9ee24dc9dc1c916b91abbd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-01-09 05:22:13 +00:00
Juha Karjalainen
f4b482d844 Provision: install unixodbc-devel library 
Adds odbc support for rhel7.

Task-number: QTBUG-72444
Change-Id: I49b1e91d9f87bdf98601627538aaa65b78440451
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-01-08 15:09:55 +00:00
Liang Qi
6d4cb1849a Merge remote-tracking branch 'origin/5.12' into 5.12.1 
Change-Id: I53782263d173268fdfd3a3116c7fc6b596716992
 2019-01-08 13:30:22 +01:00
Qt Submodule Update Bot
6f297420bb Update submodules on 'dev' in qt5 
Change-Id: I049658e51a118f46ab46a9e7fa70f6560a8b7982
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-08 09:56:32 +00:00
Qt Submodule Update Bot
ca52fc7e29 Update submodules on '5.12' in qt5 
Change-Id: I68c69cdc9b74c52bc0729fc51144a8fdd9d783ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-08 05:11:47 +00:00
Qt Submodule Update Bot
19a9abeac6 Update submodules on 'dev' in qt5 
Change-Id: I47de211a3ba630daafd58fb4e8e1fcff382b4e75
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-07 15:01:44 +00:00
Tony Sarajärvi
6b64780b61 Fix .ci.local to .intra.qt.io in docker provisioning 
Change-Id: I9de241e70a5dd15568619da6e4a19d54e76e5a4c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-01-07 15:01:31 +00:00
Simo Fält
421eb7551b Provisioning: Enable support for printer test 
Task-number: QTQAINFRA-992
Change-Id: Ibf13b8df51e72b2885c85af7bb256c73ce5697ed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-01-07 15:01:24 +00:00
Tuomas Heimonen
f7b6a4c276 Add qtsaferenderer extra targets for Coin 
The cross-compile targets that qtsaferenderer needs do not exist in qt5
therefore we add those extra targets for CI.

Task-number: QSR-378
Change-Id: Ia07074392b09af8d111a957027407f85518e5d85
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
 2019-01-07 13:28:36 +00:00
Qt Submodule Update Bot
fe79ca444b Update submodules on '5.12' in qt5 
Change-Id: I3ce524dab858e04fd2098385557893efbfa4c6ad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-07 06:02:09 +00:00
Qt Submodule Update Bot
f30e44e9ff Update submodules on 'dev' in qt5 
Change-Id: I348d25b8c0a90d8b1bd6ff20e759bcedb05b3f6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-07 05:09:11 +00:00
Qt Submodule Update Bot
6e4aed08e1 Update submodules on '5.12' in qt5 
Change-Id: I52940e20029c38b79e9f437395d5cf91c4f9f7d4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-06 08:59:53 +00:00
Qt Submodule Update Bot
677c4d62c5 Update submodules on 'dev' in qt5 
Change-Id: I934499413588606f3db7acf499f4f6da59f7941a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-05 08:07:47 +00:00
Qt Submodule Update Bot
69b079c38e Update submodules on '5.12' in qt5 
Change-Id: Iccf7bb925a120556c11db3396e67571c69ca9d68
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-04 20:58:52 +00:00
Qt Submodule Update Bot
f103df4826 Update submodules on 'dev' in qt5 
Change-Id: I4eb4a253bbf94463ea2743c81f34ed21df101b35
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-04 19:54:24 +00:00
Heikki Halmet
72d0cfc6dc Provisioning: Add Squish Coco for RTA 
Task-number: QTQAINFRA-2393
Change-Id: I391a2670a46835988da6fd1d9121172c706c7a21
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
 2019-01-04 14:09:59 +00:00
Qt Submodule Update Bot
7324ace490 Update submodules on 'dev' in qt5 
Change-Id: Ie53a57b7b1da333cc5274c2071232f361e8cb2c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-04 09:25:45 +00:00
Qt Submodule Update Bot
07063160ae Update submodules on '5.12' in qt5 
Change-Id: I8fea0b5ffaadbf5670fd2408b9f9c2e410c49cdb
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-03 20:32:07 +00:00
Tony Sarajärvi
2657a96f0e Upgrade macOS 10.12.3 to 10.12.6 
Also changes the resolution of the desktop to 1280x800x32,
timezone to GMT and upgrades Xcode.

Task-number: QTBUG-70180
Change-Id: I4620cbfa3033a100b0e325951a5a9ebcbfa92751
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-03 12:59:57 +00:00
Juha Karjalainen
e28da040ee Provisioning: Unify duplicated openssl provisioning script 
MacOS(10.12 and 10.13) had two identical provisioning scripts for
openssl. Now unified under common.

Change-Id: If469a56d431e72b291a810fa9c1b701873fe382d
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
 2019-01-03 11:46:20 +00:00
Frederik Gladhorn
b78812f84e Reduce the number of zypper invocations 
Change-Id: Ibb1c76fc4786d19a921c31b0933746f9dfefcde8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-03 08:03:31 +00:00
Qt Submodule Update Bot
8e7b85af99 Update submodules on 'dev' in qt5 
Change-Id: Id3bea223f49d19d801fa5ea880ce42e5312534e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-03 05:03:28 +00:00
Qt Submodule Update Bot
c231323b74 Update submodules on '5.12' in qt5 
Change-Id: I77e2984900d563a6effb5e31c7f20654e5624b71
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-03 05:03:17 +00:00
Qt Submodule Update Bot
20b96704ee Update submodules on 'dev' in qt5 
Change-Id: I9da113cf7cd79ed9ba04b1a764644c7920951508
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-02 19:48:39 +00:00
Joni Jäntti
2306cb69c8 Provisioning: Windows: Disable automatic defragmentation 
Automatic disk defragmentation is enabled by default on Windows
machines. It should be disabled to save some time.

Task-number: QTQAINFRA-2217
Change-Id: I3f024208bd35c9e305569e6b2b562f5a8b16f6f1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-01-02 12:23:01 +00:00
Liang Qi
38e2fc6b80 Merge remote-tracking branch 'origin/5.12' into dev 
Conflicts:
	.gitmodules
	coin/provisioning/common/linux/docker_testserver.sh
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Done-With: Ryan Chu <ryan.chu@qt.io>
Change-Id: I9bc3afcb50783a9f0f7718731d237de4be287cae
 2019-01-02 10:46:49 +01:00
Qt Submodule Update Bot
05c1f1cf99 Update submodules on '5.12.1' in qt5 
Change-Id: I1e2e226840416c8ae0166950dd62a3180dd52ee1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-01-01 19:34:46 +00:00
Qt Submodule Update Bot
da65a37041 Update submodules on 'dev' in qt5 
Change-Id: I26b5fbbd0279f6321550deaf3425d52dff4d274d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-01-01 02:31:13 +00:00
Qt Submodule Update Bot
b6283a31c8 Update submodules on '5.12' in qt5 
Change-Id: Iafeef38423c165f29169adf499b554b78e1a6c60
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-12-31 21:30:43 +00:00
Tony Sarajärvi
2dd72ec5a6 Fix .ci.local to .intra.qt.io in provisioning scripts 
Change-Id: I113095b337c3592757878fb919a0a18a60a8ce7e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-12-31 13:02:00 +00:00
Juha Karjalainen
55a990322b Provisioning: Install ODBC for macOS 10.12 10.13 
This script installs libiodbc from brew and adds it to
CPLUS_INCLUDE_PATH and LIBRARY_PATH thus enabling configure to
find it and thus enabling odbc support for qt build on macOS.

Task-number: QTBUG-58956
Change-Id: I7f865800b580a87afcc480534da57ee546c74406
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
 2018-12-31 10:45:04 +00:00
Simo Fält
0a6d32bdd8 Provisioning: Install XCode 10.1 
Task-number: QTQAINFRA-2323
Change-Id: I8fa4e146b2da71fba641f982d8114a916df42fc7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-12-31 08:12:20 +00:00
Qt Submodule Update Bot
f95cd8d3f1 Update submodules on '5.12' in qt5 
Change-Id: I4b4259963187eeeb8a4914c5581f3b4c69d70aa5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-12-27 14:49:15 +00:00
Qt Submodule Update Bot
72182d1333 Update submodules on 'dev' in qt5 
Change-Id: I2c75b03cc707bf24c5e4e20a908fd5a1348d09b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-12-27 08:41:22 +00:00
Qt Submodule Update Bot
a1ace2e097 Update submodules on '5.12' in qt5 
Change-Id: I252064eb22e7360fdaf31e97bca31da562af6d6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-12-25 21:30:44 +00:00
Qt Submodule Update Bot
4d785fc3db Update submodules on '5.12' in qt5 
Change-Id: I211a94a83d207cbc522ba4256004c6d17caeeebd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-12-25 18:19:18 +00:00
Qt Submodule Update Bot
88a777b242 Update submodules on '5.12' in qt5 
Change-Id: I16389902fc5c4ac89d3f287c1b31384a825f6b8e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-23 15:09:05 +00:00
Qt Submodule Update Bot
c245638131 Update submodules on 'dev' in qt5 
Change-Id: I63d8b91dec1e0eb4a11b9f8332d2f7dd203abdd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-12-23 10:15:56 +00:00