summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.11.1' in qt5v5.11.1wip/qt3dstudio/2.0.1wip/qt3d-runtime/2.0.1Qt Submodule Update Bot2018-06-1725-0/+0
| | | | | Change-Id: I1b1caa12ea3b4e6c36b2051d88ad8492d17d06cf Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.11.1' in qt5Qt Submodule Update Bot2018-06-1115-0/+0
| | | | | Change-Id: Ibc6aaaa9d4de853685695d192495e98d98d81082 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.11.1' in qt5Qt Submodule Update Bot2018-06-081-0/+0
| | | | | Change-Id: I54afe311c809984962f9644830899e00d1766f96 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.11.1Liang Qi2018-06-0812-20/+76
|\ | | | | | | Change-Id: I0bfda3a8816684275bd7f63372684cdf3e8b9ac3
| * Provisioning: Add 64 bit Mingw to coin as packaging targetSimo Fält2018-06-064-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-06-0618-0/+0
| | | | | | | | | | Change-Id: I49fd99ca74e396010e65069e04579daa81b4fab2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-06-058-0/+0
| | | | | | | | | | Change-Id: I01ace9bc6ad2805a7a3cdf5b464357e4bad5dc19 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-06-0240-0/+0
| | | | | | | | | | Change-Id: I363b007807ce65746d22ad2e2608aa17c5859deb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Provisioning: Install 32 bit python to 64 bit windowsSimo Fält2018-06-018-20/+43
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Update submodules on '5.11.1' in qt5Qt Submodule Update Bot2018-06-0840-0/+0
| | | | | | | | | | Change-Id: Ia0779127ef3859678ef194b0af2e4fdb5b25d9f5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Adjust submodule branchesOswald Buddenhagen2018-06-011-40/+40
|/ | | | Change-Id: I9c6e8ecf1798041b1d2524cb80be936b56216e47
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-06-018-0/+0
| | | | | Change-Id: Ib58c5a24c0398483da71115e049f1cbcfa8732b9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-309-0/+0
| | | | | Change-Id: I695ecee66a9a0c256e6df2c68790cf3f9d58ac9a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-297-0/+0
| | | | | Change-Id: Ib8dd64712bea33b7dffc46ea13bdd7c5239121cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Remove broken proxy setup from RTA 32-bit Windows 10Joni Jantti2018-05-292-2/+0
| | | | | | | | | 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>
* Update winrtrunnerOliver Wolff2018-05-281-3/+4
| | | | | | | | | | | | | 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>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-271-0/+0
| | | | | Change-Id: Ic5b0846668d59b88e47e432dd692b569079e09a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-265-0/+0
| | | | | Change-Id: I09f4b1a1c4d50f935f5d7c83fcab232d05630b68 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove hardcoded download pathMaurice Kalinowski2018-05-2512-11/+23
| | | | | | | | | | | | | 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>
* Provisioning: Update Open62541Maurice Kalinowski2018-05-251-1/+1
| | | | | | Change-Id: I04d8dfed982c68efb83f28a2f34f8632e3a66312 Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-258-0/+0
| | | | | Change-Id: Ide77625c853aa01db8e4d6e51bc7d693788884c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-2413-0/+0
| | | | | Change-Id: I167745a5280f35ab02e81e4a55c87f779d3f1a1a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-221-0/+0
| | | | | Change-Id: I75e33acd5abd94893ba89acc249ef3808b04b06f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Restore clang version 4.0 to RHEL 6.6Simo Fält2018-05-211-0/+43
| | | | | | | | | 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>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-211-0/+0
| | | | | Change-Id: I1b7a7a9970f15669e9957a99b1f932e0ad22a209 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-201-0/+0
| | | | | Change-Id: I3883afd4c1f626825e7c5741364f255862a2e512 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-196-0/+0
| | | | | Change-Id: I24c92fc659cbf40271b171ecf8179ffed14e5454 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.11' in qt5Liang Qi2018-05-185-0/+0
| | | | | Change-Id: I9398f42e940a4249e1fece564e51aa028e7f7464 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Liang Qi2018-05-182-0/+13
|\ | | | | | | Change-Id: Ifa6c63ef62e339b90e571b13c73addaa17d7af4e
| * Update submodules on '5.11.0' in qt5v5.11.0-rc2v5.11.0wip/qt3dstudio/2.0wip/qt3d-runtime/2.0wip/pyside-setup/5.11.0Qt Submodule Update Bot2018-05-161-0/+0
| | | | | | | | | | Change-Id: Ibd0c5cf8c72518bd5bb608dfe3c7946f6bc2d121 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.11.0' in qt5Qt Submodule Update Bot2018-05-162-0/+0
| | | | | | | | | | Change-Id: I4de0d56b6bd15782984f67e4107b7ec9a90731e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.11.0' in qt5Qt Submodule Update Bot2018-05-153-0/+0
| | | | | | | | | | Change-Id: I13dae70cd516b623c9e9039a6c8b71de84e88459 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix linking of qdoc against an external libclang (part 1)Simon Hausmann2018-05-142-0/+13
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-184-0/+0
| | | | | | | | | | Change-Id: I888cec01eaeab2b2029b172061d2ce07170faa97 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-175-0/+0
| | | | | | | | | | Change-Id: I9d3f11e5fa9df3a4596474312a2ffc0426e495c5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.11' in qt5Liang Qi2018-05-167-0/+0
| | | | | | | | | | Change-Id: Ib08b9121da4235621876f41686f2715f01db0b30 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-157-0/+0
| | | | | | | | | | Change-Id: Ia95638ce97e677ceeb0bfd85b287735b6027eeb6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Change QNX7 x86 release builds to x86_64Samuli Piippo2018-05-151-2/+2
| | | | | | | | | | | | Task-number: QTBUG-67746 Change-Id: I677019909d56d8b227f0607069cbf3ab0cf7fec3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-144-0/+0
| | | | | | | | | | Change-Id: Ia5f7391624235fe85ba4ee591ff7a9dacc380a61 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-114-0/+0
| | | | | | | | | | Change-Id: I0bbfab039743e644b1acf3321bb900c4ad8a43f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-05-1036-0/+0
| | | | | | | | | | Change-Id: I7020e4048d61eec71f931da3fc12da2613d3dab8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.11.0' into 5.11Liang Qi2018-05-099-25/+25
|\ \ | |/ | | | | Change-Id: Ia252225aa1339ac448dd726b149e08739c02dfc5
| * Update submodules on '5.11.0' in qt5Qt Submodule Update Bot2018-05-093-0/+0
| | | | | | | | | | Change-Id: Ia6d3ee44db368765612cea543952878499889d6b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.11.0' in qt5v5.11.0-rc1Qt Submodule Update Bot2018-05-042-0/+0
| | | | | | | | | | Change-Id: I73fe6947d8ffdf56ea77e9aab5eb89955a0eed2f Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.11.0' in qt5Qt Submodule Update Bot2018-05-036-0/+0
| | | | | | | | | | Change-Id: I37be73eba9442b56b5f7147e7d69b98ce464b44d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Install the MinGW build of libclangSimon Hausmann2018-05-014-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Update submodules on '5.11.0' in qt5Qt Submodule Update Bot2018-04-282-0/+0
| | | | | | | | | | Change-Id: If2f1f76270195f337803ba302e46049acb015e3c Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.11.0' in qt5Qt Submodule Update Bot2018-04-2824-0/+0
| | | | | | | | | | Change-Id: Ica9fca497f78dd4660118814acce3a4c2c0e68b7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update clang version to 6.0Jędrzej Nowacki2018-04-288-22/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version also contains statically compiled libraries so we can ship qdoc without shipping libclang. The change temporarly removes CI qdoc builds from RHEL6 and MinGW, these two configurations are not used for packaging, just for CI testing. We should restore MinGW later. Task-number: QTBUG-66015 Task-number: QTBUG-67764 Change-Id: Ie37b4be6a639e81d9ef0815682c6d60981cbeaae Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Fredrik de Vibe <fredrik.devibe@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.11.0' in qt5Qt Submodule Update Bot2018-04-2425-0/+0
| | | | | | | | | | Change-Id: I16b8e45bd4dff9470299aced9fdf5302878f61f8 Reviewed-by: Liang Qi <liang.qi@qt.io>