lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-30 18:35:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,540 Commits 118 Branches 270 Tags
bf87526ff08f273cb89b0765e174258dcdab7e67
Commit Graph

3540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Hausmann
bf87526ff0 Add QtConnectivity 
Now that the cmake port landed

Change-Id: I5218a23fffd8de736ffcf5e039d369aec0827f42
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-10-24 15:49:17 +00:00
Qt Submodule Update Bot
edf6851875 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ice21b858ec75f6319bee745c47790293e0f3d4d1
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-24 15:10:34 +00:00
Qt Submodule Update Bot
a331d9e655 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I083e08e3c24c1d29d7fedc69490187765a651b12
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-23 12:41:46 +00:00
Simon Hausmann
33d9eb2b99 Work around cmake issue breaking C++ feature detection on Android 
As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version
of CMake we're currently using in the CI has an issue detecting clang as
GNU compatible C++ frontend and thus fails to convert the values in the
CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around
this for now as suggested in the upstream ticket. We can remove this
when upgrading to a newer cmake version.

Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-10-17 15:15:09 +00:00
Liang Qi
0c687679c7 platform_configs: add Android arm64 build on RHEL 7.6 host 
* install vcpkg and for android
* a remaining issue in vcpkg: https://github.com/microsoft/vcpkg/issues/8506

Task-number: QTBUG-78945
Change-Id: I484612e2157bf1c1142934cc4f27729e8be37b89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-10-11 18:56:33 +00:00
Liang Qi
ecf2f4f38c provisioning: update python to 3.7 on macos 
Task-number: QTQAINFRA-3271
Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-10-11 07:23:46 +00:00
Liang Qi
9e3b3c838c platform_configs: add a RHEL 7.6 build 
A preparing for having android build later.

* install gcc 7.x
* install git 2.x
* install a few other dependencies

Change-Id: I18f05bdfb78c92b7f05f67609613b5271b400f91
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-10-10 05:34:27 +00:00
Liang Qi
6df365e0b2 Add qtserialbus to qt5 
Change-Id: Ie3ad2a734b1f7ba341a93ff7f3cd96fee56c62c6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-10-09 08:27:00 +00:00
Qt Submodule Update Bot
beb62ece41 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I9b900f788ada06c5aa163464b467d41bdc4f9a4e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-09 04:47:19 +00:00
Qt Submodule Update Bot
660a81feda Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I243f87e1f922a604ac473a22c38a2fcb97bed583
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-08 18:08:37 +00:00
Qt Submodule Update Bot
714686610e Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ia7dadd5ba374c17a9de0a0a0fe5cf71349b2dcf6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-08 13:13:37 +00:00
Qt Submodule Update Bot
91a1add070 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I1a4c4dbd484521019d7c31b524110e24402ac96c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-08 06:21:10 +00:00
Qt Submodule Update Bot
c69c92ba37 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ib9ca071946f1fa578543802707388cf67f1a842b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-06 11:35:29 +00:00
Qt Submodule Update Bot
c79a9570da Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Id1a1a1a7ab7f8280221fa824ddb775691444c3d8
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-04 10:11:49 +00:00
Qt Submodule Update Bot
65dcf13a10 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I402e989617238940b5c11b4eac1b76f37e89536f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-03 09:34:25 +00:00
Liang Qi
1478b607d6 Provisioning: install libsdl2 on ubuntu 
Change-Id: I3c547c1e44ebc734fd9908db2828440bc13f55f5
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-10-03 08:15:51 +00:00
Liang Qi
bd3b4ef170 Add qtgamepad and qtscxml to qt5 
Change-Id: I7267704b048aae8cdd634d47c7ae4040272298ea
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-10-02 15:55:08 +00:00
Qt Submodule Update Bot
8e0249218f Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ifcd9682f77549feada64323c6b7ee668962cbf2c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-01 18:54:30 +00:00
Qt Submodule Update Bot
b5ae486a0d Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Iaf43abe04e52a56cb5a3d1f7d62868c5b5f009d1
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-01 06:51:39 +00:00
Alexandru Croitor
cba04eb531 Build examples on at least one configuration 
Ubuntu Linux in this case.

Change-Id: Ic17b3f4880105e639340ffc07c52de27245612d7
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-30 09:14:06 +00:00
Qt Submodule Update Bot
c97967de98 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ib89a5977eef689938a8e3ac12141204b733aa79d
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-27 16:39:54 +00:00
Qt Submodule Update Bot
cc733ed0ca Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ie4ae842e78078a4779e22f68889a211d1980411a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-09-27 14:26:20 +00:00
Qt Submodule Update Bot
bc77f3ca14 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Idee08dbe60f6abae4495f31b66a74702788f809f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-27 04:46:08 +00:00
Qt Submodule Update Bot
5c79b8cf52 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I4ceab395f4a906627970b67486ac6f91842873af
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-26 06:33:44 +00:00
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