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,247 Commits 118 Branches 270 Tags
f99d5e8b78c7a7eb96673db3942015681c8a4fa4
Commit Graph

3247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Hausmann
f99d5e8b78 Re-enable qttools for use with cmake 
Change-Id: I040b8769af22290a986ccac476f30e7eed78b3e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-06 09:04:50 +00:00
Simon Hausmann
e4259942ff Add empty build instructions to allow for qt5 integrations 
The build shall be empty for now, but this allow testing module wide
updates.

Change-Id: I47bcdae274edb2ec000bb57480d74614d3b55833
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-05 14:34:12 +00:00
Simon Hausmann
2b42c7d383 Update qtbase manually to pull in build fix for qttools 
Change-Id: I223b8c2f10bc05a5eacd103b65a061365e58ab46
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-05 13:38:20 +00:00
Qt Submodule Update Bot
a30c79bcfb Update submodules on 'wip/cmake' in qt5 
Change-Id: I90667c3b7b1920d129cc8821059a56a9d9f70766
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-05 11:58:23 +00:00
Liang Qi
5bd6aa7c26 Include qtimageformats and qtnetworkauth in wip/cmake 
Change-Id: I9f451ef08663a635ca05427735a31da895a68607
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-05 11:56:43 +00:00
Liang Qi
30d78feb0c Include qtgraphicaleffects in wip/cmake 
Change-Id: Ie8fd5d478caa1d16cdea3c06a9b7cfeeb7dcd0cc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-05 07:45:36 +00:00
Liang Qi
651b050e13 Include qtdeclarative in wip/cmake 
Change-Id: I9d23a60fbd88e30ee688532dbe5112dd3245b9a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-04 17:52:10 +00:00
Simon Hausmann
bd8feeb6b2 Update qtbase manually 
Hopefully this pulls in the last fixes to make declarative work.

Change-Id: I7c4765be631b917ee51e200977a01a913bc619b2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-04 13:59:53 +00:00
Qt Submodule Update Bot
9eefc9213e Update submodules on 'wip/cmake' in qt5 
Change-Id: Id515390a8b8af0d989609d44fcc1e4d113190bca
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-04 13:19:25 +00:00
Qt Submodule Update Bot
4259affdb7 Update submodules on 'wip/cmake' in qt5 
Change-Id: Ibf9eb43c66e2bb4d3c8e17d2ff99794408df9b9e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-03 11:51:34 +00:00
Qt Submodule Update Bot
34dd42b9f8 Update submodules on 'wip/cmake' in qt5 
Change-Id: I989dc05dc59095f47defb8cf4af20b40060ac2ab
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-03 09:27:51 +00:00
Qt Submodule Update Bot
580d5fcc32 Update submodules on 'wip/cmake' in qt5 
Change-Id: Id663bfb78313de014c8412396321253a505f80c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-02 13:24:15 +00:00
Qt Submodule Update Bot
9ba0de3708 Update submodules on 'wip/cmake' in qt5 
Change-Id: Iee3299d179b8dfcdc7b69dd683c4be685610605a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-31 06:10:32 +00:00
Liang Qi
4bf048f7a7 Include qtsvg in wip/cmake 
Change-Id: I6df7b31637e9512dc7fe92819741d01af3f87310
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-08-30 10:40:25 +00:00
Qt Submodule Update Bot
91e7e78e63 Update submodules on 'wip/cmake' in qt5 
Change-Id: I30bfbcd5e25391613bc5c7219446d0bc336894cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-30 08:41:25 +00:00
Qt Submodule Update Bot
9828fd1d7b Update submodules on 'wip/cmake' in qt5 
Change-Id: If619405e5fb6aed8b4c2e9829514825e785d37b5
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-29 05:53:46 +00:00
Qt Submodule Update Bot
21bcce41eb Update submodules on 'wip/cmake' in qt5 
Change-Id: I45e93ee3d0f5e0ada30608cc9d3b459b9c594a56
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-24 08:22:32 +00:00
Qt Submodule Update Bot
bbf5272c81 Update submodules on 'wip/cmake' in qt5 
Change-Id: I1fef265d608fd7729f8f3493d11660dce0502406
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-22 05:15:42 +00:00
Qt Submodule Update Bot
48b228f728 Update submodules on 'wip/cmake' in qt5 
Change-Id: Id919678e8e69dfe3c80d43fa9dbd10df7f02462d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-16 07:44:25 +00:00
Qt Submodule Update Bot
af7097ed42 Update submodules on 'wip/cmake' in qt5 
Change-Id: Ie79c40427bf35051b853df9209cee16ad15de0fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-11 21:47:43 +00:00
Qt Submodule Update Bot
30ca64e65b Update submodules on 'wip/cmake' in qt5 
Change-Id: I85cbd5003e89b2b2af2237dd6a5489b45057e3c2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-07 12:38:55 +00:00
Qt Submodule Update Bot
139e8e4701 Update submodules on 'wip/cmake' in qt5 
Change-Id: I5440f3860baca1ca151a0e35f835103c596a1e1c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-04 09:55:52 +00:00
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