summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set the list of submodules to those needed for Qbswip/qbs/masterwip/qbs/1.10Jake Petroules2017-11-143-291/+0
| | | | Change-Id: I8b4dc36d4b0a3af7eb393a4c7fd28b7db29989f2
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-09-2335-0/+0
| | | | | Change-Id: Ibafa1abb3f6dae7532892444618490f835ba78cb Reviewed-by: Liang Qi <liang.qi@qt.io>
* 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>
* Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit hostAkseli Salovaara2017-09-041-2/+2
| | | | | | | | | | From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries requires Windows 64bit machine. Linking requires more RAM than Windows 32bit can address. Change MSVC2013 & MSVC2015 integration host machines accordingly. Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add UploadConfigureExe featureAapo Keskimolo2017-09-022-13/+13
| | | | | | | | | We used to solve the requirement for uploading configure.exe from product version, but we can add this as a feature and remove the dependency to product version. Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provision vanilla Windows 8.1 x86 and use itTony Sarajärvi2017-09-0140-92/+241
| | | | | | | | | | | | | Replaces existing Windows 8 x86 builds with a vanilla tier 1 image that gets all needed software provisioned except for VS2013 that is pre-installed. Also modifies existing provisioning scripts under common to support this 32bit OS. Task-number: QTQAINFRA-1383 Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-09-011-0/+0
| | | | | Change-Id: Idfea61ecc744f07c6212fa4f29de808103393702 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* provisioning: windows: ICUJoni Jäntti2017-09-011-2/+118
| | | | | | | | Fixed ICU script to actually install ICU instead of just setting the environment variables. It is required to build qtwebkit. Change-Id: I8881f9c11599d99b4d400595c9b929cf6f37088a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Make CI use a new provisioned Win 10 templateJoni Jäntti2017-09-0113-4/+15
| | | | | | | | | | | | 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: Ieeb2ae3c53841644996d99ca86228df6f825a63a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Install python3 on all platformsSimo Fält2017-08-3018-1/+319
| | | | | | | | | | | Python3 is required in 5.6 by pyside-setup. Task-number: QTAUTO-345 Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74) (cherry picked from commit a7658388892bc70c3c5f3a6f6e31639ef5b766d1) (cherry picked from commit 1859f9b26ce0177cb83e917148b10ff08bb25db7)
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-305-0/+0
| | | | | Change-Id: If6a7d9a6d34a5e25459c1c3bca1ef55f923eeeae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix code duplication for cmake installation on LinuxSimon Hausmann2017-08-303-106/+55
| | | | | | | Share the code for installing cmake on Linux. Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix adding to path lines for Windows provisioning scriptsJoni Jäntti2017-08-302-1/+6
| | | | | | | | | | | Currently the path addition command will forget the previous addition when adding a new string. This hasn't been found out because python was the only script using this command. Now we also need to set the path for ruby, so the python string is left out. Change-Id: I39721d78111550189e52a9f095030033f9660c0a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
* Provisioning: Fine tune cmake provisioning scriptTony Sarajärvi2017-08-301-4/+51
| | | | | | | | Add version printing and move version strings to variables for easier reuse. Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: Add $PATH properly in .bashrcTony Sarajärvi2017-08-302-2/+2
| | | | | | | | | | | If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Id963f0f8b1cc74b02d35c1a91eb974ed816839ab Reviewed-by: Simo Fält <simo.falt@qt.io>
* Provisioning: Disable system updatesHeikki Halmet2017-08-165-0/+56
| | | | | | | | This change will disable system updates from App Store to prevent unnecessary network load Change-Id: I7915ec6ffce681a850abef59d58f953effd6deb0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-165-0/+0
| | | | | Change-Id: I5e3b9c2b92ee4403054820cd6a902c9dfbac0e0f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Make CI use a new win 8.1 provisioning instead of win 8Joni Jäntti2017-08-1159-206/+810
| | | | | | | | | | | | | 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 8 template. Made all the Windows platforms use the scripts under provisioning/common/ instead of duplicate files. Task-number: QTQAINFRA-1357 Change-Id: Ic3f0b50079b212437fff711379f243753ab84872 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update provisioning scripts with new intra.qt.io addressTony Sarajärvi2017-08-0814-20/+20
| | | | | Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-082-0/+0
| | | | | Change-Id: I3fc0805275d848bc4323e521ecfdf5cc06a518f4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-061-0/+0
| | | | | Change-Id: I5e7608f87019c2aed077dc85963b1c349c17824e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-052-0/+0
| | | | | Change-Id: I3da0ef78a783a692825f8bc7000d28c8b35fb7b6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove unused provisioning scriptsSimon Hausmann2017-08-047-167/+0
| | | | | | | | | RHEL 7.2, Ubuntu 15.04, 16.04 and OpenSuSE 42.1 are not used in the Qt 5.6 branch. Let's remove the scripts to avoid confusion. Change-Id: I3829ea320ad77ebd25c9cf5bebfeed89f37f44dc Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add Documentation feature to one Ubuntu 14.04 buildFrederik Gladhorn2017-08-041-1/+1
| | | | | | | | | When creating packages, we build the docs on one configuration. Previously that was done by magic inside the continuous integration system. Make it a bit less magic by having a flag for it. Change-Id: Iee5be7037023929b319beffaacb1592dc87d6078 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-014-0/+0
| | | | | Change-Id: Ic0bc89be8a9b0d3dda06f6f43bbe21e60032a65f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Turn off line ending conversion for .commit-templateJoerg Bornemann2017-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | When committing a change, the automatically generated git commit message consists of 1) The content of .commit-template 2) Informative text for the current commit, generated by git. While 2) always has LF line endings, even on Windows, 1) might have CRLF line endings if core.autocrlf=true. The result is a text with mixed line endings. With the default editor vim, every line of the commit template part ends with ^M. Fix this by forcing the line endings of .commit-template to be LF regardless of core.autocrlf. Change-Id: I6db825695466d7f48f1fa4f771d83fb872fdb576 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Provisioning: Fix virtualenv in macOS 10.11Simo Fält2017-07-191-0/+17
| | | | | | | | | | There are multiple Python installations in our macOS 10.11 Tier1 template. Most of them are pretty old and not even working properly. One of the affected Python tool is virtualenv, which atm is creating Python 2.6 env by default even if Python 2.7 is the default Python. Change-Id: I8bc0900976a9dc79637539802345175c85b7b433 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Use updated Ubuntu 14.04 in CIJędrzej Nowacki2017-07-181-4/+4
| | | | | | | | | | | | | The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: I34d7a56a2c5530376f74bb35faf461e2e18da14a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-123-0/+0
| | | | | Change-Id: Id5ae5de68635938bc402242a3d98cb3765154d43 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-062-0/+0
| | | | | Change-Id: I8701d1b838be1730ccaaa2835c47e0389bb4bcc3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-041-0/+0
| | | | | Change-Id: I5f1e4425bf98dd9fba31f21392dfec9d991ebf7d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-303-0/+0
| | | | | Change-Id: I077670116fb8fa2fdce44a0260aacfedf16234c6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-264-0/+0
| | | | | Change-Id: I0c2e8c0756239c679a2442c164c1eafa5b21f84e Reviewed-by: Liang Qi <liang.qi@qt.io>
* Centralize Mesa LLVMPipe installation on WindowsSimon Hausmann2017-06-207-11/+68
| | | | | | | | | | | Install the DLL for general availability on all Windows systems. Due to its distinct name it will not be picked up by anyone unless Qt explicitly selects it. This gives us the ability to choose the GLES backend to use in Qt. Change-Id: Ie36f202ead7080a8f7690734d305bd27f0c9f56b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-176-0/+0
| | | | | Change-Id: I6c6a2f3d51f4899809810123112081a47f054358 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix Postgresql and Mysql environment variablesSimon Hausmann2017-06-122-8/+8
| | | | | | | | | | | | | | | | | | The correct paths to the headers are c:\utils\postgresql[x86]\pgsql\include not c:\utils\postgresql[x86]\pgsql\pgsql\include Same for libs. Regression introduced by commit ce47238ed94f3a989c13fef93b037904589910cf but only noticed in the 5.9 branch. Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Remove QNX Windows buildsSimon Hausmann2017-06-071-2/+0
| | | | | | | | | We can't get those to work with the faster KVM based VMs, so disable these builds for the time being. Task-number: QTQAINFRA-1208 Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>