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

3041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Tony Sarajärvi
f678ae3769 Fix soft links and file modes of a few macOS provisioning scripts 
Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-04-01 15:16:52 +00:00
Qt Submodule Update Bot
d0d7ade759 Update submodules on '5.12.3' in qt5 
Change-Id: I34e1bd8f276b6e9eb2a1f658f2447fdd01fd4d09
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-30 20:26:00 +00:00
Qt Submodule Update Bot
b9e40e2fd7 Update submodules on '5.12' in qt5 
Change-Id: I2df7f448e6f121039e343b3dd87d7fbbcbef25fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-28 19:35:06 +00:00
Qt Submodule Update Bot
35b489b1bd Update submodules on '5.12' in qt5 
Change-Id: I7e7a49b60f4082d177c59dd3ccdd752fc4e3c5ca
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-27 20:11:53 +00:00
Kari Oikarinen
84aaf6871c Adjust submodule branches 
Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0
 2019-03-25 10:07:35 +02:00
Qt Submodule Update Bot
b02d849d76 Update submodules on '5.12' in qt5 
Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-23 08:32:42 +00:00
Tony Sarajärvi
665703efc9 Remove 32bit MSVC 2015 from the CI 
Task-number: QTQAINFRA-2251
Change-Id: I4006c7390759e2eb357309de36eb23af007a576e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 2019-03-23 08:32:35 +00:00
Juha Karjalainen
a97d669a20 Provisioning: Remove certificate printing to log 
macOS openssl provisioning printed certificates to log. This patch
prevent printing certificates to log by redirecting it to /dev/null

Task-number: QTQAINFRA-2841
Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
 2019-03-22 12:06:56 +00:00
Qt Submodule Update Bot
7cc57995bf Update submodules on '5.12' in qt5 
Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-22 08:56:29 +00:00
Qt Submodule Update Bot
209b8117bd Update submodules on '5.12' in qt5 
Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-21 18:29:30 +00:00
Liang Qi
78afd2d4b6 Merge remote-tracking branch 'origin/5.12.2' into 5.12 
Change-Id: I8795e84dd750cbb2b55a03c861b911f57a1e2626
 2019-03-21 14:26:56 +01:00
Qt Submodule Update Bot
323dcdb60f Update submodules on '5.12' in qt5 
Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-20 15:31:56 +00:00
Johanna Äijälä
c71f004171 Provisioning: add dependency walker to win10 x86 
Needed by RTA.

Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-03-20 13:23:34 +00:00
Heikki Halmet
0660a25cca Provisioning: Make gnuwin32 available for windows machines 
This script will install gnuwin32 to the windows machines so it can be
removed from qt5

Task-number: QTBUG-73422
Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-03-17 08:16:25 +00:00
Johanna Äijälä
675deb1474 Add Squish for MSVC2017 x64 to Win10 x64 machines 
Also Squish for MinGW x86 on Win7 x86.

Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-03-14 05:27:53 +00:00
Paul Wicking
cc1203311a Update comment in clang-format file 
Change-Id: I18f14a1956f508317f8a3995873a14bc1af29594
Reviewed-by: Andy Maloney <asmaloney@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2019-03-11 10:33:26 +00:00
Qt Submodule Update Bot
f9c5acb2ff Update submodules on '5.12' in qt5 
Change-Id: I4f983c014f06d1d396b13fde8e58d473bf5c988a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-11 06:19:46 +00:00
Heikki Halmet
76c80866af Provisioning: Help script for removing items 
Sometimes items are locked (access denied) so we need to have function
which waits and retry until removing is possible.

Task-number: QTQAINFRA-2806
Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2019-03-10 14:32:03 +00:00
Qt Submodule Update Bot
afa1b053fe Update submodules on '5.12' in qt5 
Change-Id: I324c45e79a1719943cdd8544a3ddbefc9394421c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-08 21:38:55 +00:00
Paul Wicking
e403403b39 Update clang-format config 
Set column width to 100 as described in the official Qt coding style
(https://wiki.qt.io/Qt_Coding_Style).

Also, break constructor initializers before the colon and after the commas.

Change-Id: I6ac5a21ce831a35a0d74e699192ba981c8a8ba3c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2019-03-08 13:53:33 +00:00
Qt Submodule Update Bot
ec772e3e4a Update submodules on '5.12' in qt5 
Change-Id: Ie5d3cf0419efe268c3268fd4e5038c61677e57ea
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-08 08:50:13 +00:00
Qt Submodule Update Bot
7100c54887 Update submodules on '5.12.2' in qt5 
Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
v5.12.2 		2019-03-08 04:47:08 +00:00
Johanna Aijala
88b35a4921 Update Squish to 6.4.3 
Froglogic has not yet released Squish for Qt5.13 but we can use Squish
packages build with Qt5.12.

Remove msvc12 Squish, not needed.

Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-03-07 06:18:26 +00:00
Qt Submodule Update Bot
cfea5af0ed Update submodules on '5.12' in qt5 
Change-Id: I99b557104856e3cbf7375f56e7f42b77430bf49f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-05 06:41:22 +00:00
Qt Submodule Update Bot
b74bc40b41 Update submodules on '5.12' in qt5 
Change-Id: I31fc2036208413ee138e6154f65af60e15f0e00c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-02 21:37:30 +00:00
Liang Qi
4df2866684 Update submodules on '5.12' in qt5 
Change-Id: I20eba8a90e0683263245a01eac5a553c78961050
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-01 19:05:44 +00:00
Qt Submodule Update Bot
3a1e557e54 Update submodules on '5.12.2' in qt5 
Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-02-28 19:08:08 +00:00
Antti Kokko
091820f6a1 Remove qt3d-runtime.txt symbolic link from platform configurations 
Caused recursion in CI platform configuration parsing algorithm.
Add qt3d-runtime.txt back as regular file.

Task-number: QTQAINFRA-2804
Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-02-28 04:08:21 +00:00
Qt Submodule Update Bot
ffe8fd7701 Update submodules on '5.12.2' in qt5 
Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-02-27 19:35:15 +00:00
Heikki Halmet
099b7ffe4c Provisioning: Update emsdk version 
Task-number: QTBUG-73867
Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
 2019-02-26 11:11:15 +00:00
Qt Submodule Update Bot
becac559b7 Update submodules on '5.12.2' in qt5 
Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-23 06:47:32 +00:00
Qt Submodule Update Bot
83d5226604 Update submodules on '5.12.2' in qt5 
Change-Id: I131875e52b21ab1c354955cf82427470094da8ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-02-21 19:06:48 +00:00
Juha Karjalainen
9c60d8b190 Fix: Set correct path to environmental variable 
Env variable BREAKPAD_SOURCE_DIR had /src at end which was
not needed.

Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2019-02-18 13:17:52 +00:00
Qt Submodule Update Bot
b3b6b100e6 Update submodules on '5.12.2' in qt5 
Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-16 06:50:30 +00:00