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,582 Commits 118 Branches 270 Tags
154c24cc4f958dfdcc4b00403aad46793b89d27c
Commit Graph

2582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liang Qi
154c24cc4f Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-05-31 22:07:11 +00:00
Edward Welbourne
21a37fe009 Remove LGPL_EXCEPTION.txt 
It became obsolete when we switched to LGPL3, as discussed on the developer
mailing list in April 2017.

Change-Id: I67913f46c81730ffdc0f56163e854fd7043b2514
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2018-05-31 05:58:21 +00:00
Liang Qi
0a2465bc30 Merge remote-tracking branch 'origin/5.11' into dev 
Change-Id: I7502e49bc75f84b7fb2d4534181a2082fc939265
 2018-05-30 21:19:11 +02:00
Qt Submodule Update Bot
feb12a86f8 Update submodules on 'dev' in qt5 
Change-Id: I9039e373e97899ea9ec756e07b278ea8c1f20aef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-30 16:48:29 +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
ff8efac616 Update submodules on 'dev' in qt5 
Change-Id: Ib89eaa00e83cf0d124980660397a54aafc506196
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-29 07:48:01 +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
f11b58d500 Update submodules on 'dev' in qt5 
Change-Id: I5b5825abf17a302fde54efb7fb24684f3461b6dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-28 06:56:21 +00:00
Qt Submodule Update Bot
9ca1d1bf8f Update submodules on 'dev' in qt5 
Change-Id: Ib7cdc0ff958af88d011c1db1a49e11f7378582d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-27 17:40:32 +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
Maurice Kalinowski
d9fcbde41d Provisioning: Install Open62541 on Windows 
Open62541 is one of the supported OPC UA backends in the Qt OpcUa
module.

Change-Id: I9baaffbae058d0590819e248694ee41887558708
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-05-25 06:45:00 +00:00
Qt Submodule Update Bot
7670e95e52 Update submodules on 'dev' in qt5 
Change-Id: I4f192d544796443b3986393d386323791563918c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-25 06:44:56 +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
8aa0d92d3d Update submodules on 'dev' in qt5 
Change-Id: I2b45743807a8b4456e58756ecf7e4a8afa476b8f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-22 06:29:55 +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
9dbddbcc8e Update submodules on 'dev' in qt5 
Change-Id: I3401f64d62d459c640c2e3239b09861a17f8a2f0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-21 08:25:01 +00:00
Qt Submodule Update Bot
3c3f50c015 Update submodules on 'dev' in qt5 
Change-Id: I2e63b1e58332e29a6f229069756e1da6e5373709
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-20 09:16:33 +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
Qt Submodule Update Bot
5b5f008526 Update submodules on 'dev' in qt5 
Change-Id: I1de969915ada8d1915da4107ff7e4620340fb269
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-19 08:34:26 +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
03138c3980 Update submodules on 'dev' in qt5 
Change-Id: I4478023c65825d45085b3fe3bf77fda0a3bfe827
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-17 09:20:53 +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
f6f9bd6d93 Update submodules on 'dev' in qt5 
Change-Id: Ia4432c50cba26e11284b74d5ea87d9a77b8da950
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-16 10:43:52 +00:00
Jędrzej Nowacki
54261be7c3 Remove RHEL 6 from the CI 
RHEL7 was introduced to replace RHEL6, we do build packages on RHEL7
already. The only coverage that it adds is an old gcc, but in the same
time it is quite expensive to maintain because of generally old
software stack.

Change-Id: I9955747efecefc3354aa9e1f1c45f7d1bc48dfc6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 2018-05-16 10:43: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
defbea3929 Update submodules on 'dev' in qt5 
Change-Id: I05469b85b7cf92b21ed9c3e82a89c116ff66abe0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-15 12:27:13 +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
e18e2b1a49 Update submodules on 'dev' in qt5 
Change-Id: I046ebf51bbccb3e75275ba57fdf1c555d41ae6df
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-14 09:32:33 +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
a32c6e3d8d Update submodules on 'dev' in qt5 
Change-Id: I666fee90000d4a36d5f2acd47e43fd0d95d954b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-05-11 08:17:56 +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
e77da9ecb3 Update submodules on 'dev' in qt5 
Change-Id: Ie4e6177e118c2783723ca8c12fbab50be6044912
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-05-10 17:06:55 +00:00
Liang Qi
1e5cf1852a Merge remote-tracking branch 'origin/5.11' into dev 
Change-Id: Ia167d4f873ed500e3bae798eade6720db6b21750
 2018-05-10 12:38:49 +02: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