lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,207 Commits 118 Branches 270 Tags
8f2b2dba786e28429a207c209190d5a260981e05
Commit Graph

3207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Liang Qi
073dfc6457 Update submodules on 'wip/cmake' in qt5 
Change-Id: I437150950324ad3734ad895b6cbc4ad7bf6139a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-08 14:19:22 +00:00
Liang Qi
21604cf7da Provisioning: install vcpkg and some packages on Windows 10 
Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:37:10 +00:00
Liang Qi
4c655a140b Provisioning: install latest cmake - 3.14.1 on Windows 
Change-Id: I461589be02c26e048d5975d59600376022d728fd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:37:05 +00:00
Liang Qi
ad2f91e414 Provisioning: Add Windows 10+MSVC2017 to test cmake build 
Change-Id: I7acd16f12ed0e5d0fb7a9961c9099b9e4f1a2401
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:37:02 +00:00
Liang Qi
cb860d794d Provisioning: Add freetype to the list of installed packages on macOS 
Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:57 +00:00
Liang Qi
705696e1d1 Provisioning: Add pcre2 to the list of installed packages 
This external dependency is now required by QtCore on macOS.

Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:45 +00:00
Liang Qi
8b0a10d1c1 Provisioning: build cmake from source on macOS 10.13 
Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:42 +00:00
Liang Qi
05eaaeda4b Add macOS 10.13 to test cmake build 
Change-Id: I676db571d3a14f2abd823d41905b95a070c66f59
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:38 +00:00
Liang Qi
e57569e70c Update submodules on 'wip/cmake' in qt5 
Only needed for qtbase though.

Change-Id: Ib3fdd44c2804139795fc1efc192e05d227f8b8dc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:27 +00:00
Liang Qi
ff8220f9f6 Merge remote-tracking branch 'origin/dev' into wip/cmake 
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtbase.txt

Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
 2019-05-03 10:10:23 +02:00
Liang Qi
577d01e9df Provisioning: disable docker test servers on Windows 10 (x86_64) 
This reverts commit 177df80f09 partially.

Change-Id: I6c091ad48397ad221090274144ac88dfa47c0e0f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
 2019-04-16 08:57:44 +00:00
Liang Qi
e10a2d4ffe Merge remote-tracking branch 'origin/5.13' into dev 
Conflicts:
	.gitmodules

Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
 2019-04-14 23:11:30 +02:00
Liang Qi
74eab55ea8 Update submodules on 'dev' in qt5 
Change-Id: Ibb626ef0429631b901bfb894935b12cad1af6a5c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-14 20:26:28 +00:00
Qt Submodule Update Bot
f2af07b8ed Update submodules on '5.13' in qt5 
Change-Id: Icdc234fca978fd0f510462390b7de537485c7d25
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-13 20:30:54 +00:00
Qt Submodule Update Bot
085407eb93 Update submodules on '5.13' in qt5 
Change-Id: I6052700191cd9ebd56e1f97fd0f7d52bdb5ef62e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-13 17:15:26 +00:00
Liang Qi
8710c7d9cf Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	coin/platform_configs/qt3d-runtime.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
	coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
 2019-04-13 11:38:39 +02:00
Qt Submodule Update Bot
869c15629d Update submodules on '5.13' in qt5 
Change-Id: Ifb78bd23df6129ccb226b7e0862ebe5620353b3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-13 07:32:12 +00:00
Qt Submodule Update Bot
f31970d5ac Update submodules on '5.12' in qt5 
Change-Id: I79cbed7287f7b160624b77b08df04d8fd33c7907
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-12 17:40:23 +00:00
Qt Submodule Update Bot
bf868c7e7a Update submodules on '5.13' in qt5 
Change-Id: I64ac0b2aeaaed0908aaebff7c45b486b8159e893
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-12 17:05:13 +00:00
Qt Submodule Update Bot
21a6541aeb Update submodules on '5.12' in qt5 
Change-Id: Ibe1d38a062889777ab9d8dc5ec4d2fb46e8b4cb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-11 16:03:13 +00:00
Juha Karjalainen
48443b4b9a Provisioning: update python 2.7.14 to 2.7.16 
Python 2.7.14 used tlsv1 which is no longer accepted by github
thus needing update to newer version.

Task-number: QTQAINFRA-2900
Change-Id: I4e0790854b7c0732e4064ad355d953eb7b71a2b9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-11 06:10:22 +00:00
Juha Karjalainen
d269710383 Change linux webasembly build from devoloper build to release build 
Change-Id: Ic2481d69b69e6bc50d583adf5e1d2857abc6ec25
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-11 06:09:11 +00:00
Qt Submodule Update Bot
403d4e1d96 Update submodules on '5.13' in qt5 
Change-Id: I1e38740b9e4f4c9570d02d5b131def095418778f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-11 05:48:40 +00:00
Qt Submodule Update Bot
314db90904 Update submodules on '5.13' in qt5 
Change-Id: I240eb1ed9c19588a40f27ca35759fc23320c235b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-beta2 		2019-04-10 10:43:51 +00:00
Heikki Halmet
791ec923a7 Provisioning: Echo Emscripten version information to versions.txt 
Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-10 06:06:56 +00:00
Qt Submodule Update Bot
6db224cfc7 Update submodules on '5.12' in qt5 
Change-Id: If36b8642907dc68d9d53cfe01bfa91a9d25f3fff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-10 06:06:53 +00:00
Heikki Halmet
b3e35cbac5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning 
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-09 09:17:20 +00:00
Qt Submodule Update Bot
261cc1bd8f Update submodules on '5.12' in qt5 
Change-Id: I0e3a8b053ca414cff6e066f24514727b25e444bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-09 03:39:42 +00:00
Ivan Donchevskii
338fce191a Provisioning: Install i686 mingw on Windows 10 X64 
Required to compile 32-bit binaries.

Fixes: QTQAINFRA-2896
Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-08 06:36:50 +00:00
Alex Blasche
16201ab31d Deprecate QtXmlPattern module 
Change-Id: Iec4561cd6ae38b8133d4f0ddaf5ed0ecb03d4304
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2019-04-08 06:28:02 +00:00
Heikki Halmet
c654e63c87 Update Windows 10, MSVC 2015 and MSVC 2017 
Windows 10 updated to build 1809
msvc2015 update 3 14.0.25431.01
msvc2015 update 3 (KB3165756)
msvc2017 5.18.2 4.7.03056

ms-zune is no longer available in the latest
Windows 10 version

dotnet and msvc 2015 update patch installation
moved to pre-provisioning. Msvc 2015 update patch installation
seems to be flaky with this windows version.

Task-number: QTBUG-68190
Task-number: QTQAINFRA-2255
Task-number: QTBUG-71125
Change-Id: I87defffa488cb75f7de0909020073b35476bea80
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-05 05:04:34 +00:00
Liang Qi
8630f18d1e Only update qtwebengine in this round 
Change-Id: Ic8a307e2a3dd774adf6484894531b9a177bec58f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-05 05:04:27 +00:00
Tony Sarajärvi
b2afcc8405 Fix shellcheck complaints from provisioning scripts 
Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-01 15:16:59 +00:00
Tony Sarajärvi
f678ae3769 Fix soft links and file modes of a few macOS provisioning scripts 
Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-01 15:16:52 +00:00
Heikki Halmet
c09135cb56 Provisioning: Update Android NDK to version r19 
Also let's start using 64-bit Android NDK for Windows

Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-01 11:42:49 +00:00
Qt Submodule Update Bot
2f59bd5fbe Update submodules on 'dev' in qt5 
Change-Id: I619cf4f0168d08cb2e94b23db557d9a53f9e5338
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-31 07:59:08 +00:00
Qt Submodule Update Bot
b9da3a4bda Update submodules on 'dev' in qt5 
Change-Id: I393b5619168e820b3ffbcf7263c47c93abb81aa9
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-30 14:05:17 +00:00
Qt Submodule Update Bot
7eeee0df43 Update submodules on '5.13' in qt5 
Change-Id: I81587903b3fdf6d68c3e91d0c6d21c591e2746a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-29 21:05:29 +00:00