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
2,507 Commits 118 Branches 270 Tags
bfda8d1f253d0282f48d7cb6b4a5046dc973bf32
Commit Graph

2507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
bfda8d1f25 Update submodules on '5.11' in qt5 
Change-Id: I3b6197f122aaeca5eb1838db41d3fb864eb4043a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-06-09 08:41:01 +00:00
Simo Fält
eb1ca70def Provisioning: Add 64 bit Mingw to coin as packaging target 
Change will provision DirectX SDK with enabler DotNetFramework also, so
that configure for MinGW will detect ANGLE correctly. The DirectX
headers and libs will be in two location, while those are installed
with MSVC also.

Task-number: QTBUG-35288
Change-Id: I04ca71a73b22cd4eb27987a368cd9ede03b0e437
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-06-06 08:37:51 +00:00
Qt Submodule Update Bot
e28ed4a3a4 Update submodules on '5.11' in qt5 
Change-Id: I49fd99ca74e396010e65069e04579daa81b4fab2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-06-06 06:52:54 +00:00
Qt Submodule Update Bot
02127d3654 Update submodules on '5.11' in qt5 
Change-Id: I01ace9bc6ad2805a7a3cdf5b464357e4bad5dc19
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-06-05 06:00:58 +00:00
Qt Submodule Update Bot
bdbc314b2a Update submodules on '5.11' in qt5 
Change-Id: I363b007807ce65746d22ad2e2608aa17c5859deb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-06-02 10:41:06 +00:00
Simo Fält
6c295ac7f0 Provisioning: Install 32 bit python to 64 bit windows 
In order to create 32 bit Pyside wheels we have to be able to link
Pyside against 32 bit python. While 32 Qt build is done in 64 bit
Windows Pyside must follow.

Task-number: PYSIDE-646
Change-Id: I30855d4cecd6bc6219021216e9c296d28c56b405
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-06-01 13:21:30 +00:00
Qt Submodule Update Bot
6b243aa278 Update submodules on '5.11' in qt5 
Change-Id: Ib58c5a24c0398483da71115e049f1cbcfa8732b9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-06-01 06:50:50 +00:00
Qt Submodule Update Bot
e09cd7630f Update submodules on '5.11' in qt5 
Change-Id: I695ecee66a9a0c256e6df2c68790cf3f9d58ac9a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-30 05:56:51 +00:00
Qt Submodule Update Bot
7c3689778e Update submodules on '5.11' in qt5 
Change-Id: Ib8dd64712bea33b7dffc46ea13bdd7c5239121cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-29 06:51:23 +00:00
Joni Jantti
e9faaf8239 Provisioning: Remove broken proxy setup from RTA 32-bit Windows 10 
Currently the proxy disabling script on 32-bit Windows breaks the
internet settings, preventing browser usage for example.

Change-Id: I77282f0d929a6223ceafd3b648d2e2a7b16186c9
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-05-29 06:47:16 +00:00
Oliver Wolff
e57ef7c949 Update winrtrunner 
A newer build of winrtrunner is needed. It is built from dev and
contains fixes related to handling of test output (most
importantly 044e9ad878ed1cf0ace0a9260b55cc94c71a294d).

To make the script more stable, the newer version of winrtrunner
was also copied to ci-files01, so that an alternative download
location can be offered.

Change-Id: I6a429aa3292266067756ce7ba3553088dc168197
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
 2018-05-28 11:38:29 +00:00
Qt Submodule Update Bot
15ae235e51 Update submodules on '5.11' in qt5 
Change-Id: Ic5b0846668d59b88e47e432dd692b569079e09a3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-27 17:06:00 +00:00
Qt Submodule Update Bot
6f6efe15fd Update submodules on '5.11' in qt5 
Change-Id: I09f4b1a1c4d50f935f5d7c83fcab232d05630b68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-26 00:02:24 +00:00
Maurice Kalinowski
b317ad8096 Remove hardcoded download path 
Previously all files got downloaded to a hardcoded path, including the
username for the CI machines. Usually, it does not fit the username of a
local development machine, complicating to reproduce bugs.

Introduce Get-(Default)DownloadLocation functions in helpers to
specify the default download location. This helps to run the
provisioning scripts on a local machine.

Change-Id: I761a92bf5e3e774358756a95dddb9a5d6ee54db9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
 2018-05-25 10:25:55 +00:00
Maurice Kalinowski
45709cec07 Provisioning: Update Open62541 
Change-Id: I04d8dfed982c68efb83f28a2f34f8632e3a66312
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
 2018-05-25 07:32:00 +00:00
Qt Submodule Update Bot
275f53c681 Update submodules on '5.11' in qt5 
Change-Id: Ide77625c853aa01db8e4d6e51bc7d693788884c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-25 06:43:46 +00:00
Qt Submodule Update Bot
32c5bc52ce Update submodules on '5.11' in qt5 
Change-Id: I167745a5280f35ab02e81e4a55c87f779d3f1a1a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-24 16:04:51 +00:00
Qt Submodule Update Bot
0cd3312bd4 Update submodules on '5.11' in qt5 
Change-Id: I75e33acd5abd94893ba89acc249ef3808b04b06f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-22 00:01:29 +00:00
Simo Fält
2a27a539e7 Restore clang version 4.0 to RHEL 6.6 
Libclang is required for Pyside to compile, so dropping it totally would
block Pyside development.

Change-Id: I9c0deb3f0457f97bc4c36179971d49d58ca244a6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
 2018-05-21 11:51:19 +00:00
Qt Submodule Update Bot
407d64d584 Update submodules on '5.11' in qt5 
Change-Id: I1b7a7a9970f15669e9957a99b1f932e0ad22a209
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-21 08:25:13 +00:00
Qt Submodule Update Bot
b496b5f4d2 Update submodules on '5.11' in qt5 
Change-Id: I3883afd4c1f626825e7c5741364f255862a2e512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-20 00:00:55 +00:00
Qt Submodule Update Bot
9dbf3d46ba Update submodules on '5.11' in qt5 
Change-Id: I24c92fc659cbf40271b171ecf8179ffed14e5454
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-19 11:49:55 +00:00
Liang Qi
b6c915e4c5 Update submodules on '5.11' in qt5 
Change-Id: I9398f42e940a4249e1fece564e51aa028e7f7464
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-18 21:30:50 +00:00
Liang Qi
a2b5c37d7a Merge remote-tracking branch 'origin/5.11.0' into 5.11 
Change-Id: Ifa6c63ef62e339b90e571b13c73addaa17d7af4e
 2018-05-18 11:55:23 +02:00
Qt Submodule Update Bot
ea52430c66 Update submodules on '5.11' in qt5 
Change-Id: I888cec01eaeab2b2029b172061d2ce07170faa97
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-18 07:17:37 +00:00
Qt Submodule Update Bot
3a0c2b894c Update submodules on '5.11' in qt5 
Change-Id: I9d3f11e5fa9df3a4596474312a2ffc0426e495c5
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-17 07:20:03 +00:00
Liang Qi
9cc1220a43 Update submodules on '5.11' in qt5 
Change-Id: Ib08b9121da4235621876f41686f2715f01db0b30
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-16 21:04:33 +00:00
Qt Submodule Update Bot
081601ba0e Update submodules on '5.11.0' in qt5 
Change-Id: Ibd0c5cf8c72518bd5bb608dfe3c7946f6bc2d121
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.11.0 v5.11.0-rc2 		2018-05-16 14:32:45 +00:00
Qt Submodule Update Bot
e7a999ce4d Update submodules on '5.11.0' in qt5 
Change-Id: I4de0d56b6bd15782984f67e4107b7ec9a90731e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-05-16 09:14:15 +00:00
Qt Submodule Update Bot
426708026e Update submodules on '5.11' in qt5 
Change-Id: Ia95638ce97e677ceeb0bfd85b287735b6027eeb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-15 12:50:30 +00:00
Qt Submodule Update Bot
d7b03bf0bc Update submodules on '5.11.0' in qt5 
Change-Id: I13dae70cd516b623c9e9039a6c8b71de84e88459
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-05-15 11:00:36 +00:00
Samuli Piippo
1c8ff381be Change QNX7 x86 release builds to x86_64 
Task-number: QTBUG-67746
Change-Id: I677019909d56d8b227f0607069cbf3ab0cf7fec3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-05-15 06:13:26 +00:00
Simon Hausmann
d75411d6e5 Fix linking of qdoc against an external libclang (part 1) 
This is the qt5 part of the fix for the task. For the special version of
libclang we hacked together that allows static linkage, set an
environment variable that the mighty qdoc build system can utilize to
activate the release packaging specific linkage.

Change-Id: Ie340955214585329fe8fd3bc790e3cd6c6be42f9
Task-number: QTBUG-68178
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2018-05-14 12:30:59 +00:00
Qt Submodule Update Bot
36e5f25e56 Update submodules on '5.11' in qt5 
Change-Id: Ia5f7391624235fe85ba4ee591ff7a9dacc380a61
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-14 08:53:54 +00:00
Qt Submodule Update Bot
1f510d9514 Update submodules on '5.11' in qt5 
Change-Id: I0bbfab039743e644b1acf3321bb900c4ad8a43f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-11 00:01:14 +00:00
Qt Submodule Update Bot
f5ef436426 Update submodules on '5.11' in qt5 
Change-Id: I7020e4048d61eec71f931da3fc12da2613d3dab8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-10 08:33:12 +00:00
Liang Qi
b1f1bf5560 Merge remote-tracking branch 'origin/5.11.0' into 5.11 
Change-Id: Ia252225aa1339ac448dd726b149e08739c02dfc5
 2018-05-09 22:12:22 +02:00
Qt Submodule Update Bot
b1b04fcb1a Update submodules on '5.11.0' in qt5 
Change-Id: Ia6d3ee44db368765612cea543952878499889d6b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-05-09 12:05:12 +00:00
Qt Submodule Update Bot
1989bc105d Update submodules on '5.11' in qt5 
Change-Id: I0922b0b730ec0abd02d5940fdf6b3e7b1162baba
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-09 07:43:10 +00:00
Qt Submodule Update Bot
39a109c884 Update submodules on '5.11' in qt5 
Change-Id: Ibfe4750bb82679e1a0366c77d74ef9491b642212
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-08 00:01:20 +00:00
Qt Submodule Update Bot
4d9ab7c72c Update submodules on '5.11' in qt5 
Change-Id: I29efdec1b59ea7703481840aaaf4220778eace13
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-05 07:14:29 +00:00
Qt Submodule Update Bot
8cd324b216 Update submodules on '5.11.0' in qt5 
Change-Id: I73fe6947d8ffdf56ea77e9aab5eb89955a0eed2f
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.11.0-rc1 		2018-05-04 18:21:18 +00:00
Qt Submodule Update Bot
ab7772a73d Update submodules on '5.11.0' in qt5 
Change-Id: I37be73eba9442b56b5f7147e7d69b98ce464b44d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-03 15:42:55 +00:00
Qt Submodule Update Bot
c740458cd8 Update submodules on '5.11' in qt5 
Change-Id: I3d5244647a09a02ed54879e3a79dbce7daa65460
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-03 05:47:55 +00:00
Tony Sarajärvi
80b8954591 Update openssl packages to 1.0.2o 
Change-Id: Iab7043212cc3b66c26100519d95ac18fc69fa26a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-05-02 19:01:49 +00:00
Tony Sarajärvi
b1c3eeb213 Fix styles in setting proxy 
Change-Id: Iac4243e767a7cfb29b9bb0b4603ca6509356ce8c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-05-02 19:01:44 +00:00
Tony Sarajärvi
c7562fa8ef Take proxy into use in python provisioning in windows 
Task-number: QTQAINFRA-1669
Change-Id: I2030f244da65e4fd0c3b0be54d941b065f9a180e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-05-02 19:01:40 +00:00
Qt Submodule Update Bot
f5af9f119b Update submodules on '5.11' in qt5 
Change-Id: I9e2f1fdb7f746a96d5e78889c1a77741ed9f116c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-02 11:37:57 +00:00
Simon Hausmann
41369b6282 Install the MinGW build of libclang 
This restores the MinGW installation of libclang on Windows 7 and
installs the MSVC and MinGW builds in parallel on Windows 10. For
compatibility reasons the MSVC installation is done last, to ensure that
the older LLVM_INSTALL_DIR variable points to the MSVC installation. In
addition though we now get LLVM_INSTALL_DIR_MINGW and
LLVM_INSTALL_DIR_MSVC, which qt_find_clang.prf in qttools can use in the
future.

Task-number: QTBUG-66015
Change-Id: I8b53b85d0cde597c88a089f2a05f03947828d9bd
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-05-01 06:34:05 +00:00
Tony Sarajärvi
889cdbf4a8 Fix shellcheck complaints for RHEL 7.x in provisioning scripts 
Change-Id: I489f4f25d603457c8f0444ed277a162a7fd4128f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-04-29 16:12:00 +00:00