lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 10:09:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,208 Commits 120 Branches 272 Tags
cfd35cc49849643ce2e1b37c8bebcf0acca8f2bb
Commit Graph

3208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Liang Qi
0e82de327b Merge remote-tracking branch 'origin/5.12.0' into 5.12 
Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
 2018-12-22 23:21:54 +01:00
Liang Qi
d732383e6b Update submodules on 'dev' in qt5 
Change-Id: I3cc13b9baa61251c16cacc1b96a0e0625b4ed751
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-22 03:47:27 +00:00
Qt Submodule Update Bot
db99f0563d Update submodules on '5.12' in qt5 
Change-Id: I03d42c54ab6e4acc9f67612f5a9e34e691ee0192
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-12-21 15:57:33 +00:00
Qt Submodule Update Bot
eee805a6f1 Update submodules on '5.12' in qt5 
Change-Id: I45912749fc6e25f25e1065b8f7a751d5713ee2c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-20 05:18:52 +00:00
Juha Karjalainen
cbdd122e18 Provisioning: Update install android sdk to version 28 
QT needs at least buildSdk 24 after commit
70057dfc0e53b7996acd5ef2c0f9c40aa3f66062. Updating provisioned sdk
version to 28. Please note minSDK <= targetSDK <= build/compileSDK.

Task-number: QTQAINFRA-2412
Change-Id: I0bf67cf42dfc6f707bdeae973a60c6601d2e73c3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-18 08:20:41 +00:00
Qt Submodule Update Bot
2a7ea7c53d Update submodules on '5.12' in qt5 
Change-Id: Icca1ee8d9b84ca8766e2b6a774098f936970b3ab
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-18 08:20:33 +00:00
Heikki Halmet
deacc72f73 Provisioning: Hide squish installation output from provisioning log 
This will prevent the output of unwanted information

Change-Id: I547e91ef344ec51f799b26f254139b03d20a315c
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-12-17 07:16:39 +00:00
Liang Qi
65586dfb40 Update submodules on '5.12' in qt5 
Skip qtdeclarative in this round due to QTBUG-72527.

Change-Id: I97aa9c1f472e88b3339dc39d841a5ef324b6fd90
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-14 16:36:59 +00:00
Liang Qi
43b493d223 Merge remote-tracking branch 'origin/5.11' into 5.12 
Change-Id: I262b06902381426b304d815265662a315e217c0a
 2018-12-12 20:39:25 +01:00
Qt Submodule Update Bot
a51b2dbf25 Update submodules on '5.12' in qt5 
Change-Id: Ib45df166b0096ec1ec198e6cba792cd8a41c05a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-12 13:49:50 +00:00
Oliver Wolff
7bee789af3 Add configuration to run qtconnectivity tests on winrt 
Change-Id: Ib9b61b19033d4ceb7ce15ecc8c1a0227b53bb669
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
 2018-12-12 13:49:45 +00:00
Juha Karjalainen
e21401751a Provisioning: Change how executables are waited to finish 
This patch only affects Windows.
Python3 provisioning took over 30-35 minutes. As both
32 and 64 bit versions are provisioned it took over 1h
this change lowers time taken to 5 minutes.

start-process with -wait flag waits for given process and its
sub-processes to exit.  Wait-process insteads just waits for
process to exit.

Change-Id: Ib9a323dcf9e2d07318a0d259a72ca4c4d0a4ed80
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-12-12 13:49:42 +00:00
Juha Karjalainen
bc12bb763f Provisioning: Windows 10 32bit remote desktop access allow 
Allow accessing windows remote desktop.

Task-number: QTBUG-71874
Change-Id: I70c0acc309bd5e2bc590e7cd35a918ca7940fd03
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-12-12 13:49:39 +00:00