aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-10-305-0/+0
| | | | | Change-Id: I72963749ae7d3756933c0a561f06fc90adc59dc8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Cleanup of opengl32.dll replacementTony Sarajärvi2017-10-281-52/+0
| | | | | | | | This one isn't needed as the vanilla OS already contains the original file. Change-Id: I210b62d4483ea78af7b5922c46f73e3ec6d44aeb Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Cleanup of provisioning scripts as tier1 images are vanillaTony Sarajärvi2017-10-288-131/+0
| | | | | Change-Id: I58c5cb64075c0b60e2e8881dd32d6fad3ab98ec7 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-10-2810-0/+0
| | | | | Change-Id: Id803fd815a34d0adad0e3c02cb4373b78e9a9eab Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix QNX platform configurations for Qt 5.9Jani Heikkinen2017-10-272-4/+7
| | | | | | | | | | | | With Qt 5.9 series we still deliver binaries for QNX 6.6 only -> - Add QNX 6.6 platform configurations for windows - Remove 'packaging' flag from QNX 7.0 builds - Add provisioning script to patch QNX in windows 10 as well This change fixes the previous 5.6 merge, where this should've happened. Change-Id: Icf080fa5614371627f8f5245675cb190ebaaf893 Reviewed-by: Simo Fält <simo.falt@qt.io>
* Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-10-256-0/+0
| | | | | Change-Id: I903ba51634aa67a83e980c125ccc7d063e12ca73 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-10-2415-0/+0
| | | | | Change-Id: Ica9109b0b5868ccc60043b5c861e853837bd9213 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provision vanilla Windows 7 x86 and use itTony Sarajärvi2017-10-2433-38/+236
| | | | | Change-Id: I96eefe2e69b5cbe5d68329be2bb4273d03bb85ca Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Fix Windows 10 x64 Python with new tier 1Joni Jäntti2017-10-232-12/+12
| | | | | | | | | | Current tier 1 template #9 has python and anaconda installed that came with MSVC2017. This messes with the provisioning scripts and ultimately builds such as pyside, even though qt5 builds go through. Task-number: QTQAINFRA-1503 Change-Id: Id4e1303ba2524373170f1aca7b0c7e66f9f235dc Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Add mozilla-nss-devel to opensuseAllan Sandfeld Jensen2017-10-221-0/+2
| | | | | | | | QtWebEngine now depends hard on NSS as the OpenSSL backend never worked well on Linux. Change-Id: I4ea516bcb6fafdf6efd10493750da93b1961d965 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provision ICC to openSUSE 42.3Tony Sarajärvi2017-10-192-0/+86
| | | | | | Task-number: QTQAINFRA-1196 Change-Id: I9ae6089acf3360a8a937b1108c13a78698d91bcf Reviewed-by: Simo Fält <simo.falt@qt.io>
* Make CI use a new RHEL 7.4 provisioningJoni Jäntti2017-10-1925-179/+697
| | | | | | | | | | | | | | | | | Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This commit replaces RHEL 7.2 in desktop builds, android builds and INTEGRITY builds. Task-number: QTQAINFRA-1251 Task-number: QTQAINFRA-1252 Task-number: QTQAINFRA-1253 Task-number: QTQAINFRA-1267 Task-number: QTQAINFRA-1269 Change-Id: Icef19df7fb799a4008ccdc0584821c982055e339 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-10-1923-0/+0
| | | | | Change-Id: Ic685ba43f99c41edd5727cfe4fcc823d544f2f6e Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix typo in echoing version to versions.txtTony Sarajärvi2017-10-171-4/+4
| | | | | | Change-Id: I36f9f9181fcf60774766f122e6f5526f62c8c249 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Make 7zip provisioning script add 7zip to pathJoni Jäntti2017-10-171-5/+9
| | | | | | | | | 7zip is nice to have in path for future purposes such as when cherry-picking to other branches where we use different extracts scripts. Change-Id: I40b0f8568e285d85927ad30365c0ab9224e21332 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Make Extract-7zip helper function work with the new provision locationJoni Jäntti2017-10-171-1/+4
| | | | | | | | Changed the helper function for extracting 7z files so that it also supports the new C:\Utils\sevenzip location. Change-Id: I4f2dafc4ccac71e2cd8a3c8148df4888f800484f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Make Ninja provisioning use Add-Path functionJoni Jäntti2017-10-171-2/+1
| | | | | | | We should use this helper function now that we have it. Change-Id: I9a522533795d4d4e63f608a0624378f066055b10 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Make CI use a new provisioned Win 10 templateJoni Jäntti2017-10-172-12/+12
| | | | | | | | | | Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 10 template. Task-number: QTQAINFRA-1263 Change-Id: I0f3d1072d53eb75f7405cf79139f2919eeb1f716 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-10-148-0/+0
| | | | | Change-Id: I801d03778533471c15db148fdb9d44cbc37e249f Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-110-0/+0
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I2a20f7682f088a6ff1dd1fdb987b0bde3844d2ce
| * Update submodules on '5.9.2' in qt5v5.9.2Qt Submodule Update Bot2017-10-032-0/+0
| | | | | | | | | | Change-Id: I8bc573e915e725e784789f0e3ddbd40add801b42 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.9.2' in qt5Qt Submodule Update Bot2017-10-0215-0/+0
| | | | | | | | | | Change-Id: I17daa24ba582f0fe85097f04e48a6bc6378a1b3c Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Update submodules on '5.9.2' in qt5Qt Submodule Update Bot2017-09-2528-0/+0
| | | | | | | | | | Change-Id: I7d9d8fc249fc315ab67382fdb1de77daacb1e30d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Adjust submodule branchesOswald Buddenhagen2017-09-201-39/+39
| | | | | | | | Change-Id: I4cf45c3fb92fadf5724e0941789a7fa545625753
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-10-1140-0/+0
| | | | | | | | | | Change-Id: Ic7ba6fa7ab6eb9cf76b07164ce93607798eaa5b1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Provisioning: Fix usage of DownloadURL to throw errorsTony Sarajärvi2017-09-302-2/+10
| | | | | | | | | | | | | | | | | | | | In case DownloadURL failed it's shasum check, it printed an error and threw an exit 1. This exit 1 was never handled in the calling scripts and went ignored. It was also not passed forward as it was inside a try-catch statement. Change-Id: Iae4fd6aefb75c07623ec86dc570f0a46fec659b4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Remove duplicate MinGW 5.3 provisioningTony Sarajärvi2017-09-301-48/+0
| | | | | | | | | | | | Change-Id: Ia127315ab99c902a27d24334f13e50ff23d5ddd6 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
* | Provisioning: cleanup path from cmake_linux.shTony Sarajärvi2017-09-301-2/+2
| | | | | | | | | | Change-Id: Iced9f0c7811b9de076aee115502de0841c1a59cf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-294-0/+0
| | | | | | | | | | Change-Id: I18b9043156b97206500c2aa7375cf80b55623044 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-278-0/+0
| | | | | | | | | | Change-Id: I9481fbac3934de35e731eaf4ca9e3d907b19a303 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Add official URL to MinGW Windows 10 provisioningJoni Jäntti2017-09-273-10/+52
| | | | | | | | | | | | | | | | MinGW currently uses only internal URL without backup. Added the official URL to these scripts with SHA1 checksum verification. Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Provisioning: Install Python3 development libs to OpenSUSESimo Fält2017-09-261-1/+1
| | | | | | | | | | | | | | | | Those are required to build Pyside#5.9 branch. Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-265-0/+0
| | | | | | | | | | Change-Id: I67e1530a32c84d0eb3b9bbb702922a6ae4f20362 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Change Packaging and iOS builds to macOS 10.12Heikki Halmet2017-09-252-4/+3
| | | | | | | | | | | | | | | | | | This changes swap packaging and iOS builds from 10.10 to 10.12 Task-number: QTQAINFRA-1095 Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-248-0/+0
| | | | | | | | | | Change-Id: I35d02c6c8d6ce01d10d094302782d81713163ded Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Liang Qi2017-09-2265-102/+479
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42b502f is not needed for branches >= 5.8, configure.exe does not exist anymore. 30660bf was not applied to 5.9 branch, the scripts were not adapted to new template. Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
| * \ Merge remote-tracking branch 'origin/5.6.3' into 5.6Liang Qi2017-09-1812-2/+101
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
| | * | Ensure 'clean' android Installationv5.6.3Heikki Halmet2017-09-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove old android installation and make sure new 'clean' android folder is created. Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * | Provision and build QNX660 on Win 10 x64Tony Sarajärvi2017-09-143-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the mingw from 4.9 to 5.3. Task-number: QTQAINFRA-1208 Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * | provisioning: install MinGW 530 and 630 for Win10 x64Tony Sarajärvi2017-09-143-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MinGW is an alternative option for Visual Studio. It's used to create desktop builds and for cross compiling Android and QNX. At this point it is still unclear which version is going to be used for what, but as both are supported, let's think ahead and provide them both. This also allows us to debug with the other, if the other is causing problems. Task-number: QTQAINFRA-1289 Change-Id: I2a922669c07d49370e608c093be80481c8613dc7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Provisioning: Invoke installer with Start-ProcessTony Sarajärvi2017-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By launching an installer with Start-Process and -Wait, we make sure no handles are left holding on to the installer when we try to delete it at cleanup. Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * | Provision: Move Python3 scripts from win8 to win8.1 folderTony Sarajärvi2017-09-144-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * | Update submodules on '5.6.3' in qt5Qt Submodule Update Bot2017-09-141-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I44fb9a11d14313805600ffa2f55a8f465f2307bc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Update submodules on '5.6.3' in qt5Qt Submodule Update Bot2017-09-071-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Idc2fc0d0cc1df4929c783116169f95210baa4b70 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Update submodules on '5.6.3' in qt5Qt Submodule Update Bot2017-09-0723-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic62656a48bcee76ff38849671ca3fbad7e58fc73 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Adjust submodule branchesFrederik Gladhorn2017-09-041-34/+34
| | | |
| * | | Provisioning: Fix shasum pathSimo Fält2017-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit c48355ebb58cb058df5b2ca519b6b89fbd09f380 changed the path of shasum, which was not intended. While the DownloadURL.sh utility is used by rhel in addition to macOS we can't rely on /usr/bin/shasum but we have to use the one found from PATH. Change-Id: I67bb37dcb72ba3d8d1f279646e44228b27137ec9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Provisioning: Fix DownloadURL utility's shasum checkSimo Fält2017-09-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MacOS 10.10 has older shasum tool, which does not support oneliner verification. Change-Id: If00b846d5772aa1991960675d022249d63e7bd77 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Provisioning: Hide powershell progress bar for performanceTony Sarajärvi2017-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | Fix Add-Path helper function and start using it in scriptsJoni Jäntti2017-09-044-5/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | This function was broken and only added the latest addition to the actual PATH. Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>