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

3516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
a21de5f32a Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I10025657bc7887680bfc442be6d1ce5f4dc920f8
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-25 15:33:18 +00:00
Liang Qi
1605059e87 platform_configs: remove CMAKE_VERBOSE_MAKEFILE option 
which is not in use when ninja got selected.

Change-Id: I1841471dee0f58e4a54cd05f33f4ba7c3a1a8251
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-25 10:54:34 +00:00
Qt Submodule Update Bot
29376716fd Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ib983c826d9a62d0ca506fb238c4e08981729a211
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-25 05:08:07 +00:00
The Qt Project
dc22e0dba7 Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake 2019-09-24 16:50:50 +00:00
Qt Submodule Update Bot
9bc8a3e458 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Iff018927681934d6bf06271d5a2d3ad8008bbcc3
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-24 07:30:37 +00:00
Qt Submodule Update Bot
00bafec768 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I8f67a3299fc118d337141ad680507015e41e31d4
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-23 15:37:00 +00:00
Liang Qi
44073f5563 Merge remote-tracking branch 'origin/dev' into wip/cmake 
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt

Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
 2019-09-23 16:38:06 +02:00
Qt Submodule Update Bot
709e687c84 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I3a5377e9b1f3365596e25985504342a041371886
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-22 06:50:40 +00:00
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
fd87ff83aa Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev" 2019-09-17 13:28:52 +02:00
Simon Hausmann
91108b602f Merge remote-tracking branch 'origin/wip/qt6' into dev 
Change-Id: I46d0ce36d9168a0a2fe2229ff94fc6e4a82b5308
 2019-09-17 13:08:12 +02: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
b2febbfbc7 Update submodules on 'wip/qt6' in qt5 
Only qtmultimedia and qtwebengine in this round.

Change-Id: I82a7b1db76aa0074cd42eeaea96e4e0e4539a564
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-13 14:05:59 +02:00
Liang Qi
a2151b9c7f Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6" 2019-09-13 14:05:49 +02:00
Liang Qi
14d2852597 Merge remote-tracking branch 'origin/dev' into wip/qt6 
Conflicts:
	.gitmodules
		Ignore qtquick3d for now.
	coin/platform_configs/default.txt
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.txt
	coin/platform_configs/qtbase.yaml
		We use yaml files for configurations now.
		Adjust the configurations for Qt6 as it was
		    done before in the .txt files.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9
 2019-09-13 14:04:47 +02: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
Liang Qi
1eae3c4185 Update submodules on 'dev' in qt5 
Change-Id: I87be62d19a3aee1fae16cdf27fd35ec67e30130d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-07 09:04:49 +02: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
Gatis Paeglis
8f87412708 platform_configs: replace -qt-xcb with -xcb 
... as we are removing -qt-xcb switch from qtbase as part of
stopping to bundle xcb sources.

Change-Id: I33d58b78a1d7f53d5941ebda7131bf35a71cc8e6
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2019-08-26 23:07:06 +02:00
Christian Strømme
ff75bd5297 Add QtQuick3D as a submodule in qt5.git 
Adds QtQuick3D as a preview module in dev

Task-number: QTBUG-77724
Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
 2019-08-26 12:43:06 +03: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
5f8a9b15de Update submodules on 'dev' in qt5 
Change-Id: If400cccb49bb5d470ba79077b2e9e78e8410194d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-23 06:55:03 +02: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
BogDan Vatra
9dd4451234 Android: Update Android NDK to version r20 
Fixes: QTQAINFRA-3152
Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
 2019-08-22 06:55:47 +02:00