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

3261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
b2fe8b2f09 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: If30c3b1b176d07ad273205f3f7b9a9fa30cae4f6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-21 04:26:39 +00:00
Qt Submodule Update Bot
48d218a86f Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ie505de6df9bf42d96f4dec88ecedb1347f74f401
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-20 06:13:19 +00:00
Simon Hausmann
5c1656826b Add qtserialport to qt5 
The module has received its initial port

Change-Id: Ie5814be1f52965cb2393ec331e12751472890abc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-09-19 14:42:13 +00:00
Qt Submodule Update Bot
5560b7eced Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ie983c915a2cc472c87b02934700a7219c2b0b359
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-19 13:20:57 +00:00
Simon Hausmann
afa801cd31 Re-add QtWebSockets 
Maurice ported the module and we can add it to the Qt5 set now.

Change-Id: I146e60f6f18dcf7a00775e532e715e3718644edc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-16 15:18:13 +00:00
Qt Submodule Update Bot
5df688ef3a Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I4464812c569599cad5d6d4a2b2cce0c628799b81
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-14 05:01:07 +00:00
Qt Submodule Update Bot
d696902904 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I210881714fd91a65d8016198c9b23c382d69494c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-13 14:49:27 +00:00
Liang Qi
677412dcbe Move the developer build from static suse to ubuntu 
Because we don't run tests on static build.

Change-Id: I10c7851ecebcfa3691690c6bc26a352fd5799965
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-11 05:56:37 +00:00
Qt Submodule Update Bot
c62fcdea06 Update submodules on 'wip/cmake' in qt5 
Change-Id: I37d9b32566af41419e1bb64c0cf94c66fb3e6c4f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-10 14:24:29 +00:00
Qt Submodule Update Bot
8e6a3321df Update submodules on 'wip/cmake' in qt5 
Change-Id: Iac966615b9f25dc4be021d1db59f8c933646231d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-09 19:33:32 +00:00
Qt Submodule Update Bot
bd4774f690 Update submodules on 'wip/cmake' in qt5 
Change-Id: I72c047067aee2006aedfb97fa8d7e3fc214ee590
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-07 05:14:59 +00:00
Simon Hausmann
8b7c454d35 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I9ab957cbe9f81f266ec590e9fb8100608f77f55d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-09-06 14:53:22 +00:00
Simon Hausmann
016016b64e Really add qttools to the build 
... and not qtscript accidentally, like in the previous change.

Change-Id: Ic8cd85ef7b149ffee7bc85ffa3fc9075f8a77c1b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-06 13:32:03 +00:00
Simon Hausmann
01b083ca8e Disable qtscript for the cmake build 
The module has not been ported.

Change-Id: I99041e00fb30b2a9799ee3e948f255422bbc6976
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-06 09:23:52 +00:00
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