lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-05 07:56:26 +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
dedbec30d1 Update submodules on '5.13' in qt5 
Change-Id: Ia2ae5b47bc7e4aa094c6ed72d0a7be3bef090387
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-19 22:30:48 +02:00
Qt Submodule Update Bot
a04751c10e Update submodules on '5.13' in qt5 
Change-Id: I216600c90956b5716b1ce1a787b21417dbc4089a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-18 22:31:30 +02:00
Thomas Hartmann
a0b69977c6 Add qtquicktimeline as a submodule in qt5.git#dev 
Task-number: QDS-54
Change-Id: Ic92eb39b8bd9fced3b4a701f4d40364a2d8f9e95
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-18 11:20:22 +02:00
Liang Qi
d869c671b5 Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: Idd621fa568f01f4e4481da61a4e2fb8fe1bdcaba
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-18 10:06:49 +02:00
Qt Submodule Update Bot
6f6b43593e Update submodules on '5.13' in qt5 
Change-Id: Ifb6609089d41976f649b73df26e9214ab3b49fd4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-17 22:32:31 +02:00
Liang Qi
cd8c1032c3 Update qtbase on 'wip/cmake' in qt5 
Change-Id: Ibe0281f5558efb8e0c1f00b17af367173331e30a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-17 11:34:24 +00:00
Jędrzej Nowacki
b62c39f49f Increase CI test coverage by changing GCC to ICC 
There is already other place in which we compile with GCC on Linux.

As we use ninja now, it has to be installed on open suse too.
Cmake port depends on system libraries therefore pcre2 needs to be
installed.

Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-17 10:56:43 +00:00
Qt Submodule Update Bot
dcb1c8b41c Update submodules on '5.13' in qt5 
Change-Id: Id806418087800e313ee9a14c0a99fcf7215579c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-14 22:31:34 +02:00
Heikki Halmet
644f8b7006 Fix openssl 1.1 library configurations 
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>

(cherry picked from commit de41591477)
Change-Id: Ifbb5ecc4613319265a3378b60959fffc7301ae46
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0 v5.13.0-rc3 		2019-06-13 22:47:35 +03:00
Qt Submodule Update Bot
09180d3f95 Update submodules on '5.13.0' in qt5 
Change-Id: I8883876f4360b207000d7635838fd26adb6a2f73
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-13 14:04:22 +00:00
Qt Submodule Update Bot
305278ff93 Update submodules on '5.13' in qt5 
Change-Id: I4363311b5e75dd00eb5c869d013b701a2ef7ef49
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-12 22:31:12 +02:00
Alexandru Croitor
cfd35cc498 Add a new Linux config that builds a static developer build 
Change-Id: I8e40ed674cf0a72223a0180296db8eaa6eb6da06
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-06-12 14:42:31 +00:00
Liang Qi
8f2b2dba78 Enable windows and macOS builds for yaml and cmake 
Change-Id: I91aea0fe59e77cf95f7441c646e95d038f0e0032
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-06-12 11:17:32 +00:00
Jani Heikkinen
fd1f34192a Fix qt5.git builds 
some '-' is missing from qt5.txt causing coin to ignore all configurations
from that file. So adding enough '-' in title column to solve the issue.

Change-Id: I0b8fa6c98efeece1bf93592bbb60ca627962ceee
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
 2019-06-12 13:39:26 +03:00
Qt Submodule Update Bot
d063074b0f Update submodules on '5.13.0' in qt5 
Change-Id: I0070b9d562cfb57bab5b6fad913e9dbdf2090b48
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-12 10:41:11 +00:00
Qt Submodule Update Bot
7b36e44d7a Update submodules on '5.13' in qt5 
Change-Id: Ic3abd12e65592ae218e47b96bf5e80ccf92807e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-11 22:31:13 +02:00
Qt Submodule Update Bot
0d7a64fd8c Update submodules on '5.13' in qt5 
Change-Id: I8a94229ad71e5ee71e77bbe27641239f6a6940dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-10 22:30:57 +02:00
Qt Submodule Update Bot
67ba0e70a1 Update submodules on '5.13.0' in qt5 
Change-Id: I499cced655cbac696eb8343c1f01bdf00c7dcc9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-10 11:56:07 +00:00
Qt Submodule Update Bot
bb18b48251 Update submodules on '5.13' in qt5 
Change-Id: I07ecded02a10f0d0849de89e36569e88c2d0cf8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-09 22:30:57 +02:00
Qt Submodule Update Bot
f4bbadba41 Update submodules on '5.13' in qt5 
Change-Id: I4dae0c7ec72588d61f479074307bbe9515aeb895
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-08 22:31:05 +02:00
Qt Submodule Update Bot
14adbe74dd Update submodules on '5.13' in qt5 
Change-Id: Id5b714f25384e8b6db9d314d63344440fa459b17
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-07 22:31:13 +02:00
Qt Submodule Update Bot
5bba104a41 Update submodules on '5.13' in qt5 
Change-Id: I7bb7197fced3470b41e8d2b77f0af4617607ce97
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-06 22:31:14 +02:00
Jędrzej Nowacki
2e5b5cc075 Update cmake sha1 for Windows 
It amends a6d159c9e7. Seems that I
computed sha1 for a wrong file.

Change-Id: Ie524b2c825189a91cd6b809ff7991af20bd301b1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-06-06 13:54:00 +00:00
Qt Submodule Update Bot
50bd689155 Update submodules on '5.13.0' in qt5 
Change-Id: I093500e5ebc9e53766233919eaf66dd223529300
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-rc2 		2019-06-06 11:39:44 +00:00
Jędrzej Nowacki
a6d159c9e7 Bump cmake to 3.15-rc1 on Windows 
Same as for the recent Linux and macOS change.

Change-Id: Ic7ae30333f8cd58925f697c19ca046ceac49cd32
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-06-06 07:56:27 +00:00
Jędrzej Nowacki
7df4f93cb1 Fix provisioning of cmake on macOS 
The script contains a bit of data duplication, one of the fields was
not updated.

This amends 463235a0bc.

Change-Id: Idb9e88eba1f1415a0ca29f2c3a003c8a844bb024
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-06-06 07:39:02 +00:00
Jędrzej Nowacki
36d634a7dd Fix paths when installing cmake on macOS 
This ammends d44a7a5f14.

Change-Id: I8e8644a1f8677e6e62fb6356cc6c3533ec40e454
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-06-06 07:38:52 +00:00
Simon Hausmann
716cb8185a Fix path to cmake installation script 
Amends commit d44a7a5f14

Change-Id: I52926a8e8c488beaeb70c9bf0222c7caa0ccfe9c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-06-06 06:58:55 +00:00
Qt Submodule Update Bot
220097d10c Update submodules on '5.13' in qt5 
Change-Id: Iad275ca3305f834c0ff484df8c6469931fbcb3d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-05 22:31:55 +02:00
Simon Hausmann
463235a0bc Bump cmake to 3.15-rc1 
Same as for the recent Linux change.

Change-Id: I073411bcfa8cbd692a7770cdaad3a368c6f7108d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-06-05 12:54:18 +00:00
Simon Hausmann
d44a7a5f14 Install cmake from binaries instead of from source 
The from-source installation originates from a point in time where there
was no cmake release with binaries that were sufficient. That is not the
case with 3.15-rc1.

Change-Id: I385016969f21c194b25334e3af8af7283fc5873f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-06-05 12:47:18 +00:00
Heikki Halmet
a05bd71ede Disable MySQL from packaging builds 
We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-06-05 13:25:23 +03:00
Qt Submodule Update Bot
81f478b533 Update submodules on '5.13.0' in qt5 
Change-Id: Ib895ddc3b6d81039e6661864d03f1c586a78dbba
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-05 11:55:31 +00:00
Jean-Michaël Celerier
086439b018 Upgrade CMake to 3.15.0-rc1 
Change-Id: I374631637a6521621dfa702aa2390998ef124d24
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-06-05 09:21:01 +00:00
Qt Submodule Update Bot
c15485df43 Update submodules on '5.13.0' in qt5 
Change-Id: Ie903e4f8177b324ec981a1d57e7c2e0b4f76d585
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-rc1 		2019-06-03 10:59:12 +00:00
Ryan Chu
84ff024609 Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)" 
This reverts commit 577d01e9df.

Reason for revert: force vmx instructions to Coin level B virtual machine

Change-Id: I54a97fb6dc96315768c8047d487f1ed354ab4aac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-31 07:30:23 +00:00
Qt Submodule Update Bot
02404b0cec Update submodules on '5.13.0' in qt5 
Change-Id: Idc487281a4293ad8cc5ad494b79fd941efc820ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-31 04:08:58 +00:00
Liang Qi
dae67b28ab Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: Id1f988ef49bc35a1d230480af14fc90d4efa86b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-28 22:15:01 +02:00
Qt Submodule Update Bot
f22f1007f4 Update submodules on '5.13.0' in qt5 
Change-Id: I1d1d7dd6d259b26f0c0216efd1976ac79b500e78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-27 06:08:44 +00:00
Liang Qi
5d3976765c Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: Icc5ee34380c08b8365128c4f2e18240c6d50a90c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-26 20:49:48 +02:00
Heikki Halmet
247b429c3c Install prebuilded OpenSSL 1.1.1b for Windows 7 
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-26 08:14:11 +03:00
Heikki Halmet
ebcfcbe69a Add Android x86_64 architecture 
Task-number: QTBUG-47672
Change-Id: If5044e601ceedcd47a1ab9299f6a8e5721314ecc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-beta4 		2019-05-25 08:47:52 +03:00
Liang Qi
aabcc8128c Provisioning: Add ninja to the list of installed packages 
Change-Id: I018e7812fc95c1db841720294a700a391246251d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-24 09:58:03 +00:00
Jędrzej Nowacki
79bc4f0771 Move some configure arguments to qtbase instructions 
These arguments are specific to the build and changes to them are _not_
affecting configuration.

Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-22 15:35:44 +00:00
Juha Karjalainen
3e838f2a34 Provisioning: Change openssl version to 1.1.1b 
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-22 15:34:04 +03:00
Qt Submodule Update Bot
b7c0e2db78 Update submodules on '5.13.0' in qt5 
Change-Id: I51a93793234d86494580ec6a9d53b7cd414c888b
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
 2019-05-23 04:17:14 +00:00
Liang Qi
47225925c5 Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: I3434ffc21f21f953f0538e86e0d554ae5e82b331
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-22 14:01:42 +02:00
Liang Qi
20e8121c77 Use yaml configuration file for cmake support 
It is needed by new coin to support cmake build as only
there configuration arguments are separated from features.

Change-Id: I960ec693f80803fd86de472efc953a38358ae14e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-05-20 12:37:44 +00:00
Allan Sandfeld Jensen
edc39be08b Fix qtdeclarative boot2qt CI config 
DISTRO_OPTS was missing quotes.

The same thing is also done in 3e6a04c09d.

Change-Id: Ibb237b791fedea4edde2ca0ef152553502462129
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit 04fa1bf4ef)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-16 10:42:41 +00:00
Frederik Gladhorn
5677a43a25 Remove platforms from Qt 6 
Get to a smaller set to reduce load on the CI and have faster
turnaround times while developing. Remove some older compilers
that do not support the minimum C++ feature set we want to require
for Qt 6.

We'll need to revisit and probably expand this set when we get closer
to releasing Qt 6.

Change-Id: I6afba8b3caca0fac5bbf80efdcde7714b8d1ab76
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-05-16 08:33:58 +00:00