lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 01:36:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,431 Commits 120 Branches 272 Tags
68e8df875d26ab2972d20d987e29ef990dbfb7e8
Commit Graph

5431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bcdb9ba4dd Update submodules on '5.14' in qt/qt5 
Change-Id: I30d07a8ee13b9cd8aa17bae8d4e4c7f9c6057401
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-09 06:51:12 +02: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
Gatis Paeglis
1430513438 platform_configs: add -bundled-xcb-xinput to RHEL-7.6:Packaging 
All libs, expect xcb-xinput have been dropped from 3rd party sources
in qtbase. When building default binaries for releases we used to have
"qt-xcb" switch to reduce dynamic depenendies of the binary. We still
need to do that for xcb-xinput (via -bundled-xcb-xinput) as this library
is not available on some of the supported distributions.

Change-Id: Iece12bc38978ddb66f84928f661924f076c3647e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-08 10:18:55 +02:00
Dimitrios Apostolou
dd9a3883aa Ensure provisioning works even without the secrets 
Change-Id: I3869e881341a719da8a351095c3bf314c2fa2f34
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-10-08 08:26:34 +02:00
Dimitrios Apostolou
869a9b3ae7 Fix shell function is_script_executed 
It used to return error when tested inside a login shell, because $0 is
"-bash" and `basename` was trying to interpret -b as an option.

Change-Id: I5faa2dc01e50c7d5bcfc0ab1fcfd910b2538afc2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-10-08 08:26:34 +02:00
Dimitrios Apostolou
d97d1af1ee Fix provisioning script for RHEL 6 
It seems RHEL 6.6 does not provide /etc/os-release.

Change-Id: I01ba2bb17b89c01f9991944a11eeaa9c2eba6f20
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-10-08 08:26:34 +02: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
ab732c6ab7 Update submodules on '5.14' in qt/qt5 
Change-Id: I945832ea3c2a88f427cb3c73e50f4592095e0ad6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-07 22:31:22 +02:00
Liang Qi
991ba62180 Update submodules on 'dev' in qt/qt5 
Only qtquick3d and qtwayland this round.

Change-Id: I79da5206cec8ef7a1e70dad95249fd7b5384803f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-06 21:49:44 +02:00
Liang Qi
ac2054a633 Add macOS 10.14 to the CI again 
Task-number: QTQAINFRA-2938
Change-Id: Idd331fcb29752386b95463de8bdaeb0dd6b0ac08
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-06 21:49:35 +02:00
Liang Qi
3813848266 Merge "Merge remote-tracking branch 'origin/5.15' into dev" 2019-10-06 21:49:30 +02: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
37e43d23fc Update submodules on '5.15' in qt/qt5 
Change-Id: I5da2826877d73da02e854724976afef44c303ebc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-06 13:34:53 +02:00
Qt Submodule Update Bot
37b2f54919 Update submodules on '5.13' in qt/qt5 
Change-Id: I1e4a3f0a9ec8280b5a6801096f283435c1f0f855
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-05 23:31:02 +02:00
Qt Submodule Update Bot
5d90df08c2 Update submodules on '5.14' in qt/qt5 
Change-Id: I21c5bafb841524f3dbc0cef748d3a959d3866369
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-05 22:31:01 +02:00
Qt Submodule Update Bot
1735600d57 Update submodules on '5.14' in qt/qt5 
Change-Id: I3e4f0c43898daceb419957702e31f1611de6c502
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-05 09:28:00 +02:00
Simon Hausmann
68fdf9c0be Remove WinRT from the configurations for qtconnectivity 
WinRT was tested by default and removed in commit
5677a43a25 globally.

Change-Id: I4878266cd25a05b74a4a3427840c3aaef0029032
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2019-10-04 17:29:31 +00:00
Liang Qi
44cf8f65a2 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml

Change-Id: I6adccbdcd3a4b794380a2e202e567146e663c15f
 2019-10-04 12:55:57 +02: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
689eab5c35 Update submodules on '5.13' in qt/qt5 
Change-Id: I47edb51a61cc8b9e7d7e4ec9ff1c9057e9d126fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-04 09:16:48 +02:00
Qt Submodule Update Bot
ace315a1f9 Update submodules on '5.14' in qt/qt5 
Change-Id: Iebe9c33fa630b46cdedb994b8daf002f5d20b082
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-04 09:16:38 +02:00
Frederik Gladhorn
f963556794 Remove gnuwin32 - it is provided through provisioning 
Having a few windows specific tools in qt5.git was always strange. We
now provision the utilities to the machines, so remove them from
qt5.git.

[ChangeLog][General] GnuWin32 is no longer part of the Qt source code repositories.
Instead it can be downloaded from the upstream project at https://gnuwin32.sourceforge.net .
For convenience we also make a copy available here:
https://download.qt.io/development_releases/gnuwin32/gnuwin32.zip
The GnuWin32 tools are needed for building Qt from source on Windows.
Binary package downloads are not affected.

Task-number: QTBUG-73424
Change-Id: I9212cc2923343f4f84bcba9d1444a90e446dfb8a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-03 19:49:48 +00:00
Qt Submodule Update Bot
4f903d0139 Update submodules on '5.15' in qt/qt5 
Change-Id: I823e6b4d3a4561603b2c57ff5c0ecd6738fd056d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-03 14:43:27 +02:00
Liang Qi
2d577a83ec Merge remote-tracking branch 'origin/5.14' into 5.15 
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml

Change-Id: I34cf4fb6818c17872e55f36149e8f91871d2aea1
 2019-10-03 14:40:41 +02:00
Liang Qi
52068b49e8 Update submodules on '5.15' in qt/qt5 
Change-Id: I2eafa1386aeb6356e4696bbee830330eeddefe9e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-03 13:39:47 +02: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
ec7bf6356c Merge "Merge remote-tracking branch 'origin/5.13' into 5.14" 2019-10-03 06:12:24 +02:00
Qt Submodule Update Bot
7cd2473966 Update submodules on '5.14' in qt/qt5 
Change-Id: I97f37b6418a58b0546b7a8b7b91229db5229a81e
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.14.0-beta1 		2019-10-03 06:12:11 +02:00
Frederik Gladhorn
accc0af6e4 Add clang-format-pre-commit hook 
Change-Id: I762b85b96f7ab87e6c11426607165d4f1b8dbae5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2019-10-02 23:32:53 +02: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
Liang Qi
29befcc995 Merge remote-tracking branch 'origin/5.13' into 5.14 
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml

Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
 2019-10-01 11:37:07 +02: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
Dimitrios Apostolou
cfef857815 Reduce noise in the provision logs 
Reduce verbosity in order to shorten logs and make them more readable.

In two cases we just remove the verbose flag.

In one other case we undo inlining of a huge script in the command line.
Because we run the provisioning scripts in trace mode, this caused the
script to be logged, and it was rather long and meaningless since it
comes from an external project.

Change-Id: I078ee3b3ab2db9425204375deb5815b6526a4466
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-10-01 06:11:48 +02:00
Qt Submodule Update Bot
f4e7c08e82 Update submodules on '5.13' in qt/qt5 
Change-Id: I328c1cb350e067765b0f05e75179cf178dd2b14e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-01 06:11:41 +02:00
Qt Submodule Update Bot
b90dc27784 Update submodules on '5.14' in qt/qt5 
Change-Id: I66ac39a88c5164d2feed7215029e621c122f90ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-01 06:10:51 +02:00
Frederik Gladhorn
53f93876cb Update qtnetworkauth 
In that module tests were broken since oauthbin.com is gone.
See 639800ccfe85daecd4432f8b7f64b258e7d2e6dc in qtnetworkauth.
This unblocks qt5.git.

Change-Id: I475a43c5b2ec3ce2021199c37bec4e10d8c1bb0e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-30 16:04:31 +02: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
317fbf9243 Update submodules on '5.13' in qt/qt5 
Change-Id: I0738664f8f0129431b7e5c212fe1615b09792aec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-30 06:48:30 +02:00
Qt Submodule Update Bot
1a4d0a9534 Update submodules on '5.14' in qt/qt5 
Change-Id: I1a1e2430d47476de5271b9278e84f53743bdbcee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-30 06:26:37 +02:00
Qt Submodule Update Bot
ec613d93e5 Update submodules on '5.13' in qt/qt5 
Change-Id: I1e6126cbe20e293bc4ec88a492c0bf9ebfffd766
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-28 07:03:22 +02:00
Qt Submodule Update Bot
6cb7171397 Update submodules on '5.14' in qt/qt5 
Change-Id: I5575a3cf1dd9cecf5162b077e64b28eec15bcffd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-28 07:03:09 +02: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
33e0c2b54f Update submodules on '5.14' in qt/qt5 
Change-Id: I79b9eeb90afc56baae339b6598dd01840d6918ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-09-27 09:20:43 +02:00
Dimitrios Apostolou
842b72e080 Move telegraf install to start of provisioning macos 
Change-Id: Ied2b7a415abe5e101b6bfb60472b74070debe9e9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-09-27 08:43:06 +02:00