aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-11-2219-0/+0
| | | | | Change-Id: I12db3b69a01215489142b271976e33050874bf5b Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-11-204-0/+0
| | | | | Change-Id: I6c6623f1d66a65e6d3eadeda6acb2bfee9996b6d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update qtwebengine onlyLiang Qi2017-11-191-0/+0
| | | | | Change-Id: I3f5934b4787c7206391cbfaa305138df447b1d23 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-1627-78/+328
|\ | | | | | | Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
| * Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-11-138-0/+0
| | | | | | | | | | Change-Id: I35e62f9e2869d95d2432e369dc69f57262925741 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Remove unneeded provisioning scriptsTony Sarajärvi2017-11-133-55/+0
| | | | | | | | | | Change-Id: Ie8ff5810f07528fd23044e1b1396fc4fdde58283 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Conan: fix names of ICU dll's which are added to qtwebkit binary packageKonstantin Tokarev2017-11-112-6/+6
| | | | | | | | | | Change-Id: I5e6357e8dc0e5ae44447bc13cfba8429b89934e7 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Make QtWebKit builds use vanilla Win 10 x64 templateJoni Jäntti2017-11-111-2/+2
| | | | | | | | | | | | | | | | | | QtWebKit build targets are currently using the old non-vanilla template for Windows 10 x64. Change-Id: I67c536bc86939508cb8056ac3b7372096274fa69 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Provisioning: Install expectHeikki Halmet2017-11-111-0/+2
| | | | | | | | | | | | | | | | | | Expect is needed by Release Test Automation (RTA) to automate configure testing. Change-Id: I66889c70667a12f962cbea39906bd8b7a1d63517 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Provisioning: FBX SDKTony Sarajärvi2017-11-116-0/+219
| | | | | | | | | | | | | | | | | | | | We need to provision the FBX SDK for Qt3DStudio. Task-number: QTQAINFRA-1449 Change-Id: I52587cd653b7954340d5f58978ffbd008330337c Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Provisioning: Disable NTP synchronization for WindowsJan Arve Sæther2017-11-108-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During CI, it has been observed that some processes didn't leave their wait state. (So they were "hanging") During analysis of the event log on that CI node, we found out that at the same time those processes entered this state, the NTP client set a new time and indeed the local time of the CI node changed (it was changed 2 hours forward in our case). For the record, the processes we observed this with was jom.exe and cc1plus.exe (the latter is the g++ compiler in the mingw toolchain)). We therefore have a strong suspicion that the NTP time change was causing the CI hang, so we simply disable it. The virtual machine should anyway get the correct time from its VM host when its started. Change-Id: I1204063399e2a4741b7b26b79858759c1bc5eab2 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Provisioning: Install signing tools to MacOSHeikki Halmet2017-11-091-0/+138
| | | | | | | | | | | | | | | | Install needed certificates and signing tools which are needed when signing release packages Change-Id: I21b9c3d1a6b4c83dec6b8ae1674def4ecc02f444 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Provisioning: Update Java to version 8Heikki Halmet2017-11-097-65/+3
| | | | | | | | | | | | | | | | | | | | | | | | Current version of Java isn't installing correctly during provisioning. Silent installation needs parameters which are added to script. Without those the installation process tries to open Java3BillDevices.jpg unsuccessfully and the installation fails Task-number: QTQAINFRA-1498 Task-number: QTQAINFRA-1394 Change-Id: I5672d230eb348186345887da81cdd97a4f59bce8 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Fix Ubuntu 16.04 random provisioning failJoni Jäntti2017-11-081-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ubuntu 16.04 provisioning sometimes fails in the apt-get commands for package installations. This is caused by a lock that is still in use when the system is calling the apt-get commands. This change will use the apt daemon to queue the install commands and wait for the lock to release instead of checking once and then failing if the lock is not open. Task-number: QTQAINFRA-1502 Change-Id: Idd4aff42f99cf4d14c08aef8fcc3cb7dbc58b2dd Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Update submodules on '5.10' in qt5Liang Qi2017-11-1622-0/+0
| | | | | | | | | | Change-Id: I92ef03c6036b4391aa9c380c1b55b9ac388a3b07 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-09103-423/+1161
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Also update to pyro toolchain in QEMU way. Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/platform_configs/qtdeclarative.txt coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Task-number: QTBUG-64384 Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
| * Update submodules on '5.9' in qt5wip/installer-framework/masterwip/installer-framework/3.0Liang Qi2017-11-089-0/+0
| | | | | | | | | | Change-Id: I038001efcd21e74f02786441c4a30c81d30d1336 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Provisioning: Remove logical OR when echo errorsHeikki Halmet2017-11-076-34/+34
| | | | | | | | | | | | | | | | | | | | set -e won't work if logical OR is used after commands. These error echo's need to be removed so that error catch will works. Also set -ex added to print executed command when error caught. Task-number: QTQAINFRA-1533 Change-Id: Ib4ea832a0ee813f99f59ebacad51ec57c3eff57d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Fix spelling of ANDROID_SDK_HOMETony Sarajärvi2017-11-071-1/+1
| | | | | | | | | | | | | | | | It was incorrectly created at ANDROID_SDK_ROOT, but Coin doesn't use that env variable. It uses _HOME. Change-Id: I64b8befd4341e917c7aa28586ac8bf1dbf4e23a4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Yocto toolchain provisioning to CIJoni Jäntti2017-11-064-4/+101
| | | | | | | | | | | | | | | | | | Provisioning scripts need to install Yocto toolchains (32 and 64 bit) so that the artifacts aren't needed to be unzipped during Qt builds. Task-number: QTQAINFRA-1454 Change-Id: Idceeabb7aa9ffe2555fb98c94916f8429c32af75 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-11-0610-0/+0
| | | | | | | | | | Change-Id: I07353da970e5939cfba760c23b11d74d2de02a9c Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Provisioning: Fix p7zip installationHeikki Halmet2017-11-031-4/+17
| | | | | | | | | | | | Change-Id: Id6847ee203fdee03c6db067a952f9da5188d3d5c Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Fix Windows 8 libclang script locationsJoni Jäntti2017-11-032-0/+0
| | | | | | | | | | | | | | | | | | | | | | Currently for some reason there exist both "windows-8" and "windows-8.1" folders in coin/provisioning/. "windows-8" folders contain only the libclang provisioning scripts. These should be under "windows-8.1" since "windows-8" shouldn't exist anymore. Change-Id: I19ca70079c19cebd0482cf2d7502894648f19267 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Provisioning: Refresh Subscription-managerHeikki Halmet2017-11-031-0/+38
| | | | | | | | | | | | | | | | Subscription manager needs to be refreshed so that RedHat repositories will stay available for provisioning scripts Change-Id: Idebc994fbefde951000570f6690c6849abfd3666 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Provisioning: fix .ci.local addresses to .intra.qt.ioTony Sarajärvi2017-11-0324-26/+26
| | | | | | | | | | Change-Id: I0ae934a65a2eaefa0bc4db9afbe3b8701dcb0906 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 00:11:52 +0000