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,184 Commits 118 Branches 270 Tags
6fbaba5d52c462ef8982339c3dca23bf6e45da56
Commit Graph

3184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liang Qi
6fbaba5d52 Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: Ib80ac156ec8ce5690d5ec784c671bd706afe0b4e
 2019-05-12 11:12:36 +02:00
Aapo Keskimolo
9c49284978 Remove redundant windows configuration 
The windows configuration was added by commit

 8cdf60fe64

which was unintended and caused breakages due to wrong library paths.

Regression was introduced by 65d4cea3ac12a5d585da7ee1ba2933a3c23051b8 which
allowed sharing storage paths with builds with different configure arguments.

Change-Id: I18d12c4ff86a5bb28484c7b39ca38ff4f6f590d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-12 07:29:17 +00:00
Qt Submodule Update Bot
494d10fb73 Update submodules on '5.13' in qt5 
Change-Id: Ieb925882ea0c8b536bde7f9a1d63aecdf6213632
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-09 20:44:40 +00:00
Liang Qi
0a1e27b33e Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: Ibab4a9d55ce371259f52edb1819a397c1f2d7d9e
 2019-05-09 12:04:02 +02:00
Tony Sarajärvi
8cdf60fe64 Split features list between Coin and qt 
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-08 09:18:56 +00:00
Qt Submodule Update Bot
819362c5d6 Update submodules on '5.13.0' in qt5 
Change-Id: I6e14f7f3fedc1ce69e3cedaf8a5b2251d12fae45
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-08 06:47:41 +00:00
Liang Qi
8f63da629a Merge remote-tracking branch 'origin/5.13' into 5.13.0 
Change-Id: If2321aae395ea99c0fb4cf4ef7b3c5a580d3357e
 2019-05-07 14:58:36 +02:00
Tony Sarajärvi
049eb21a1d Replace RHEL 7.4 with 7.6 in the CI 
Task-number: QTQAINFRA-2942
Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-05-07 07:15:58 +00:00
Qt Submodule Update Bot
c6b018a925 Update submodules on '5.13' in qt5 
Change-Id: Ib948b49eccead6649f228a3d7acc83a2f6522660
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-06 06:56:28 +00:00
Liang Qi
aeea2c8425 Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: Ia93633ae4ef9677ede751467a70e8f91799829a2
 2019-05-04 11:04:32 +02:00
Qt Submodule Update Bot
4c4595b93b Update submodules on '5.13.0' in qt5 
Change-Id: I637151d097b4f311f86004c2eb26f8a1d8b80ef0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-03 09:15:06 +00:00
Qt Submodule Update Bot
c2506b0f9c Update submodules on '5.13' in qt5 
Change-Id: I99a2129b1f73fc1dd801b406b9741cdfea37429e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-03 07:32:05 +00:00
Juha Karjalainen
6465c42122 Provisioning: install msys2 
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-05-03 07:30:44 +00:00
Qt Submodule Update Bot
ea052ceb0a Update submodules on '5.13' in qt5 
Change-Id: I4f9b2ff00e79cf16a9effd6bdffa679a7f25b50b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-02 09:04:01 +00:00
Qt Submodule Update Bot
d27f9e9b88 Update submodules on '5.12' in qt5 
Change-Id: If055179b9dfbc4af842c4972cabb79c2966d57d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-30 18:44:54 +00:00
Kari Oikarinen
b692cf823a Adjust submodule branches 
Change-Id: I8efc4803c92a42e67add0646be00c0d6571fb9e2
 2019-04-29 11:48:19 +03:00
Liang Qi
22bb88ed07 Update submodules on '5.12' in qt5 
Change-Id: I69ecf3e1a1f7b5dbdc6e86478475f9563854dac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-26 05:46:36 +00:00
Liang Qi
ffe0c11420 Merge "Merge remote-tracking branch 'origin/5.12.3' into 5.12" into refs/staging/5.12 2019-04-26 05:46:30 +00:00
Liang Qi
6dd08088fc Merge remote-tracking branch 'origin/5.12.3' into 5.12 
Change-Id: Ib5cb484726a93f7b317e1dd8e74b446e6673cdbd
 2019-04-25 16:05:59 +02:00
Simo Fält
09f28e9e1d Provisioning: Install python36-devel to rhel 7.4 
The rhel Python3 system package is missing development libs.

Fixes: PYSIDE-996
Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-25 12:58:28 +00:00
Heikki Halmet
65cf2cb957 Provisioning: Install Vulkan to Rhel 7.4 
Enables Vulkan support at compile time

Task-number: QTBUG-72763
Change-Id: If97adb030d50a147c9714afe3ef360291904b58a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-04-25 09:29:05 +00:00
Qt Submodule Update Bot
766fc425e3 Update submodules on '5.12' in qt5 
Change-Id: I2c02e38847615cace282fa261ac5ac526eb6ece2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-24 16:37:45 +00:00
Heikki Halmet
dbaa42baa7 Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME 
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-23 06:04:34 +00:00
Qt Submodule Update Bot
12cde4e0da Update submodules on '5.12' in qt5 
Change-Id: I2fa664d7b94bf511d4321e0698aba679ccb38ad0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-23 04:06:25 +00:00
Heikki Halmet
e72a082da5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning 
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b3e35cbac5)
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-04-18 10:01:57 +00:00
Qt Submodule Update Bot
712d5447bf Update submodules on '5.12' in qt5 
Change-Id: I01acdb8d1dc3137abb193a9ccf1dba20d6953bcb
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-16 21:19:06 +00:00
Qt Submodule Update Bot
3436df53cf Update submodules on '5.13' in qt5 
Change-Id: I4b003f32744fbf25b6439b555a01ee130d50467e
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.13.0-beta3 		2019-04-16 20:51:24 +00:00
Qt Submodule Update Bot
da9243a97b Update submodules on '5.12' in qt5 
Change-Id: Ie4120272ceba142d35265f2fbde316e2af8b30a9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-14 06:51:45 +00:00
Qt Submodule Update Bot
f2af07b8ed Update submodules on '5.13' in qt5 
Change-Id: Icdc234fca978fd0f510462390b7de537485c7d25
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-13 20:30:54 +00:00
Qt Submodule Update Bot
085407eb93 Update submodules on '5.13' in qt5 
Change-Id: I6052700191cd9ebd56e1f97fd0f7d52bdb5ef62e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-13 17:15:26 +00:00
Liang Qi
8710c7d9cf Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	coin/platform_configs/qt3d-runtime.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
	coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
 2019-04-13 11:38:39 +02:00
Qt Submodule Update Bot
869c15629d Update submodules on '5.13' in qt5 
Change-Id: Ifb78bd23df6129ccb226b7e0862ebe5620353b3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-13 07:32:12 +00:00
Qt Submodule Update Bot
f31970d5ac Update submodules on '5.12' in qt5 
Change-Id: I79cbed7287f7b160624b77b08df04d8fd33c7907
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-12 17:40:23 +00:00
Qt Submodule Update Bot
bf868c7e7a Update submodules on '5.13' in qt5 
Change-Id: I64ac0b2aeaaed0908aaebff7c45b486b8159e893
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-12 17:05:13 +00:00
Qt Submodule Update Bot
21a6541aeb Update submodules on '5.12' in qt5 
Change-Id: Ibe1d38a062889777ab9d8dc5ec4d2fb46e8b4cb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-11 16:03:13 +00:00
Juha Karjalainen
48443b4b9a Provisioning: update python 2.7.14 to 2.7.16 
Python 2.7.14 used tlsv1 which is no longer accepted by github
thus needing update to newer version.

Task-number: QTQAINFRA-2900
Change-Id: I4e0790854b7c0732e4064ad355d953eb7b71a2b9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-11 06:10:22 +00:00
Juha Karjalainen
d269710383 Change linux webasembly build from devoloper build to release build 
Change-Id: Ic2481d69b69e6bc50d583adf5e1d2857abc6ec25
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-11 06:09:11 +00:00
Qt Submodule Update Bot
403d4e1d96 Update submodules on '5.13' in qt5 
Change-Id: I1e38740b9e4f4c9570d02d5b131def095418778f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-11 05:48:40 +00:00
Qt Submodule Update Bot
8337e20fad Update submodules on '5.12.3' in qt5 
Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.12.3 		2019-04-11 03:06:13 +00:00
Qt Submodule Update Bot
314db90904 Update submodules on '5.13' in qt5 
Change-Id: I240eb1ed9c19588a40f27ca35759fc23320c235b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-beta2 		2019-04-10 10:43:51 +00:00
Heikki Halmet
791ec923a7 Provisioning: Echo Emscripten version information to versions.txt 
Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-10 06:06:56 +00:00
Qt Submodule Update Bot
6db224cfc7 Update submodules on '5.12' in qt5 
Change-Id: If36b8642907dc68d9d53cfe01bfa91a9d25f3fff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-04-10 06:06:53 +00:00
Heikki Halmet
b3e35cbac5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning 
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-09 09:17:20 +00:00
Qt Submodule Update Bot
261cc1bd8f Update submodules on '5.12' in qt5 
Change-Id: I0e3a8b053ca414cff6e066f24514727b25e444bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-09 03:39:42 +00:00
Ivan Donchevskii
338fce191a Provisioning: Install i686 mingw on Windows 10 X64 
Required to compile 32-bit binaries.

Fixes: QTQAINFRA-2896
Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-08 06:36:50 +00:00
Alex Blasche
16201ab31d Deprecate QtXmlPattern module 
Change-Id: Iec4561cd6ae38b8133d4f0ddaf5ed0ecb03d4304
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2019-04-08 06:28:02 +00:00
Qt Submodule Update Bot
7ff76b89dd Update submodules on '5.12.3' in qt5 
Change-Id: I216b93959076bc9402c715599398dea770cacde2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-04-05 11:29:29 +00:00
Heikki Halmet
c654e63c87 Update Windows 10, MSVC 2015 and MSVC 2017 
Windows 10 updated to build 1809
msvc2015 update 3 14.0.25431.01
msvc2015 update 3 (KB3165756)
msvc2017 5.18.2 4.7.03056

ms-zune is no longer available in the latest
Windows 10 version

dotnet and msvc 2015 update patch installation
moved to pre-provisioning. Msvc 2015 update patch installation
seems to be flaky with this windows version.

Task-number: QTBUG-68190
Task-number: QTQAINFRA-2255
Task-number: QTBUG-71125
Change-Id: I87defffa488cb75f7de0909020073b35476bea80
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-05 05:04:34 +00:00
Liang Qi
8630f18d1e Only update qtwebengine in this round 
Change-Id: Ic8a307e2a3dd774adf6484894531b9a177bec58f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-05 05:04:27 +00:00
Tony Sarajärvi
b2afcc8405 Fix shellcheck complaints from provisioning scripts 
Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-01 15:16:59 +00:00