aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * Provisioning: Set CMake to PATH on UbuntuTony Sarajärvi2018-01-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ubuntu uses .profile file instead of .bashrc. We need to use the correct file accordingly. Task-number: QTBUG-65594 (cherry picked from commit 22e4664eb08dc5384c5afd0bd6c6a0725b242517) Change-Id: Iceeec53882f1a5c97cd8f7ea5b013d543c156acb Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | | * Update submodules on '5.9.4' in qt5Qt Submodule Update Bot2018-01-0920-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d1b498fc931464636734fc30b7852645383fc9c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Update submodules on '5.9.4' in qt5Qt Submodule Update Bot2018-01-0517-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id238fb2be13cf7782a225e43e1d31ab195f56007 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Provisioning: Fix disabling windows updatesOliver Wolff2018-01-181-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some machines the updates were already disabled, which lead to the call to disable the service failing. Now we just move on without error. Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Fix provisioning: NotePad++ path on 64 bit windowsFrederik Gladhorn2018-01-181-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We install the 64 bit version of np++ which is installed in the regular program files folder. Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * | Fix provisioning: Wait for msvc-2013 update 5 to finishFrederik Gladhorn2018-01-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)... Removing C:\Windows\Temp\vs12-kb2829760.exe ... Caught System.UnauthorizedAccessException Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied. Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Fix checksum for QNX 7 SDK downloadFrederik Gladhorn2018-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia37c6d032d1a4c2841482292a2c2c2f8fd468859 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-179-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0e7cb3a46909c3b72e2639b9ef2214428bd02cb6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-137-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I968ccd381929d89ef988d3ac2f468b25cbeb8365 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-1931-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I7b7796d1651b5b1384f543b9e64c0c836113689c Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-185-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibbbd5202c450921ba47c33e28034fce631e82546 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-175-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I986f33a9a04f1172c5fbfe37a45f984837a2a684 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-1619-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I43c91914547bb1b27f29ce948707eaf4b8373825 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-121-1/+1
| |\| | | | | | | | | | | | | | Change-Id: Idf9c18da5527327178887c257fc56dbc27e1c8ad
* | | | Add dependencies needed to build YoctoTony Sarajärvi2018-01-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1690 Change-Id: I9583c39709849d058e6d44473e074e9327907dd8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-01-194-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6a9db841c7c6c9eba6248072caa8069dacb853da Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Add nfs-common for mounting to workTony Sarajärvi2018-01-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1690 Change-Id: I43453da3267664c664e80510e3750d1906d00078 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | | Consolidate provisioning script name for qnx in macOSTony Sarajärvi2018-01-181-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id07686bcc677b62a4981a46cabefd40b544815c5 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | Update submodules on 'dev' in qt5Liang Qi2018-01-1819-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I30571e17dc4fafbaf66232546bf33ba4965d36e8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Use "correct" registry when enabling Windows 10 Developer ModeOliver Wolff2018-01-171-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As coin is running a 32 bit application the registry key ended up in the Wow6432Node compatibility area of the registry when run on a 64 bit Windows. Windows does not use this place to check for the developer mode setting, so we use the "proper" registry instead. If adding the registry key fails the script now reflects that and exits with a proper exit code. Change-Id: Ifd6bc7e7b0ed6595a2a967597ab45053cb51e7aa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | Move QNX 7 arm build from qt5 to defaultLiang Qi2018-01-142-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNX 6.6 builds were removed. We need to check QNX in submodules build. This change amends 357de3ea1343d8bfbc2ec71d743e5981c396ca4f. Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | | Fix common folder paths for common split changeHeikki Halmet2018-01-139-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d3f1ce71d7995c88005b81f7f9dc9db892e9de7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2018-01-121-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I9a419b82cc05549f6d8e6394bec5c349aa1c9c63
| * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-115-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I7cfbf55bc3b57092e5f20a32866bb9cfa9160b9b Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Install p7zip-full, that contains the 7z binaryFrederik Gladhorn2018-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | p7zip is only a minimal version containing 7zr. Change-Id: I12531514490b6eb871419bdb61ea5896b175a678 Reviewed-by: Simo Fält <simo.falt@qt.io>
* | | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-12389-793/+1055
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Task-number: QTBUG-65688 Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-11299-271/+269
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Fixed up provisioning script locations after the reshuffeling into common/platform folders. Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-114-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If0b6b7bdb5151aa7488afed379785de63ca3aef2 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Remove 'Packaging' flag from QtWebKit MSVC2017/x86Konstantin Tokarev2018-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt doesn't provide binaries for this platform. Change-Id: Iab30435bb480ee898c2409f87facabb26fce9421 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-109-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I46157aa3edab44a436fbf9a02e6213f5c2a00f85 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Split Common folder based on operating system familiesHeikki Halmet2018-01-10282-253/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * | Remove devtoolset sourcing from openssl provisioning on UbuntuJoni Jantti2018-01-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This line is a leftover from RHEL script and needs to be removed on Ubuntu. Change-Id: I8fc8ab7cff808da997cb88a3cec4c65eaa1528a4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-073-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I4901819f1c7141d151b287e945c1e0afa0ca5b16 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-0615-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I54bae68afc005a9e5d8d29e0766504d83d983e13 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-1115-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If56253b74477a0bdc034f1daf32920d3363a27f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-097-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8c259b106a628a317c81a59c042e79c3f145a402 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | | Add +x rights to provisioning scrips missing it and consolidate shebangTony Sarajärvi2018-01-076-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e1fb37bfffd0451c02166227805b40b48d31582 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | Fix opcua provisioning by sourcing .profileTony Sarajärvi2018-01-072-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMake is installed it exports its install path into .profile. However, freeopcua doesn't source it as builds do, so it couldn't find the cmake. Also, as Ubuntu is using .profile in our builds, this commit fixes so that the PATH is actually written into the right file. Task-number: QTBUG-65594 Change-Id: I561a88a07872436bb4a3bd62a2d55fd56a130121 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | Consolidate prefixes of provisioning scriptsTony Sarajärvi2018-01-0713-72/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-0741-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8d3a6f72435d9bd1cf23146656b5bcef958e993d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-06170-156/+672
| |\| | | | | | | | | | | | | | Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
| | * | Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-051-0/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I6a2446b8ed4212e3965b37cb2c25f35ba6ed7efc
| | | * Provisioning: Ubuntu16.04 - CMakeJoni Jantti2018-01-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake is missing from the clean installed Ubuntu 16.04. Change-Id: I965bc3e55eb9b0765f483a84e5584e61054bdd80 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Merge remote-tracking branch 'origin/5.9' into 5.9.4Jani Heikkinen2018-01-05175-157/+662
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | This merge wasn't done during final downmerge from '5.9' -> '5.9.4' Change-Id: I516c24ba52575634f3932ff4f40221f31ef06ee0
| | | * | Adjust submodule branchesOswald Buddenhagen2017-12-221-39/+39
| | | | | | | | | | | | | | | | | | | | Change-Id: I3d6535fee48d27c87aab32847f5486a331402df1
| | * | | Update submodules on '5.9' in qt5Liang Qi2018-01-0513-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I95a01ff67b3d16a9a989e3b714f82c94a92d6dc4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | Provisioning: Ubuntu 16.04 - Set timezone to UTCJoni Jantti2018-01-051-0/+6
| | | |/ | | |/| | | | | | | | | | | | | | | | | Task-number: QTBUG-65435 Change-Id: I329926d0f83d47c9e69eee177c600ac629ee9415 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Set up proxy for provisioning scriptsTony Sarajärvi2018-01-029-1/+165
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1669 Change-Id: I582dc5037bd2b46dcd5c9c3b2cb13784e122d6a5 Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * | Fix shebangs and give provisioning scripts +x rightsTony Sarajärvi2018-01-0279-69/+80
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633 Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * | Add set -ex to 7z provisioning in RHEL 7.4Tony Sarajärvi2018-01-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6323055999830954df6893d72ff2031b34f0276 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>