lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-10 00:46:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,225 Commits 118 Branches 268 Tags
b7cf9cc2574ee72d5a2b255632672eeab2c5cdd3
Commit Graph

3225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
b7cf9cc257 Update submodules on 'wip/cmake' in qt5 
Change-Id: I1db600010615f24d6b35c5d6740494422cb917f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-31 11:24:26 +00:00
Qt Submodule Update Bot
caf72a3e61 Update submodules on 'wip/cmake' in qt5 
Change-Id: I4314ca80f344975b9cb01dbd7d26a2b66149f8d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-26 08:41:51 +00:00
Qt Submodule Update Bot
483aff91d5 Update submodules on 'wip/cmake' in qt5 
Change-Id: I3026b396baf1de58d44335c72d94fa42ef11e2ae
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-22 10:38:00 +00:00
Qt Submodule Update Bot
3d257d4469 Update submodules on 'wip/cmake' in qt5 
Change-Id: I30e47f20800449cf0e808dc467f88c56a106a7ee
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-04 11:57:35 +00:00
Qt Submodule Update Bot
084bc8e03d Update submodules on 'wip/cmake' in qt5 
Change-Id: I982d2416a488f18dc672089e9618db04422cf49f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-02 20:59:38 +00:00
Jędrzej Nowacki
caacdfc3e1 Remove "-DBUILD_TESTING=OFF" from default configs 
It is not needed. QtBase build instructions add it explicitly, as
the tests are build with a separate cmake call (to compile tests
against differently installed Qt).

Change-Id: I22fe26d4bdb9dd237df76246607d823f4b4fa315
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-02 13:47:59 +00:00
Jędrzej Nowacki
8e54519b75 Do not specify compiler binary name directly 
We have a code that handles that implicitly so it is not needed anymore.

Change-Id: I4aea2f55f9efd24ec7cf22cb8b413789ec3e7fea
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-02 13:47:52 +00:00
Qt Submodule Update Bot
36c9379e07 Update submodules on 'wip/cmake' in qt5 
Change-Id: Ic264dee2452ffc8b58609f5114444b49488d951b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-27 07:55:01 +00:00
Qt Submodule Update Bot
d3e2f494fd Update submodules on 'wip/cmake' in qt5 
Change-Id: Ia666fc2c946e00b901bd225e06c455474591f7f1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-26 09:00:56 +00:00
Qt Submodule Update Bot
0ec119a442 Update submodules on 'wip/cmake' in qt5 
Change-Id: Id5266aa8146f6d870fdddedc106d7ef1add5d5c6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-24 11:42:50 +00:00
Liang Qi
245f5afd71 Remove DisableTests in features 
At least we can get tests built now.

Change-Id: I7830f495002083023651ca5da3c6c39e745f920f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-06-24 11:42:34 +00:00
Jędrzej Nowacki
61d838e4f0 Move ICC compiler name setup to instructions level 
That way we can simplify product level configuration.

Change-Id: Ib855c1873d3b4566b437845ab18182a0db8e45b9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-06-24 06:25:02 +00:00
Simon Hausmann
5464a31c61 Enable freetype on the Windows build 
With the newer vcpkg this works now.

Change-Id: I8408041b338ffbe74aaec9afbb1cf8cbf3bb1d92
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-21 11:59:51 +00:00
Simon Hausmann
9d7437859b Update vcpkg installation 
Use the latest snapshot, fetch the package set from the repo itself and
set the VCPKG_ROOT environment variable as that's the vcpkg documented
interface.

The qt specific triplet defaults to static linkage, which allows
removing the %PATH% handling and resembles the same setup as in Qt 5
where we linked the 3rd-party code statically into qt.

Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-21 11:59:42 +00:00
Qt Submodule Update Bot
b53dfe6a86 Update submodules on 'wip/cmake' in qt5 
Change-Id: If09d644bb84c83a515a68bada24ab0203a6c6003
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-20 07:48:12 +00: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
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
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