aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.9.0' in qt5v5.9.0-rc2v5.9.0Qt Submodule Update Bot2017-05-271-0/+0
| | | | | Change-Id: I4e4d240d00a9696f264d2e4f5fb1e76e2545710c Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update submodules on '5.9.0' in qt5v5.9.0-rc1Qt Submodule Update Bot2017-05-223-0/+0
| | | | | Change-Id: I4b682b41b9d42a95c9d7837a0c9d2a5cd1b16d0a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.9.0' in qt5Qt Submodule Update Bot2017-05-207-0/+0
| | | | | Change-Id: I59a75557095d67dad5cf36f78fb86eb17cd05513 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update qtlocation manuallyLiang Qi2017-05-191-0/+0
| | | | | Change-Id: Ief99f6b991ea0fbfc2c0d019b68835db36539587 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.9.0' in qt5Qt Submodule Update Bot2017-05-1930-0/+0
| | | | | Change-Id: Ifc375a6978c7d8fc89396b7bfbebb18f90d59b37 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Enable WinRT builds for MSVC 2017v5.9.0-beta4Heikki Halmet2017-05-111-0/+3
| | | | | | | All 2017 configurations are added to qt5.txt for now. Change-Id: I4745c61a99891e2fc6d8b381b4aa831150fb4596 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.9.0Liang Qi2017-05-088-15/+101
|\ | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
| * MSVC 2017 updated and missing component for winrt armHeikki Halmet2017-05-036-7/+93
| | | | | | | | | | | | | | | | | | | | | | MSVC 2017 and Build Tools updated to version 15.1. Also missing component 'Visual C++ compilers and libraries for ARM' installed for winrt arm Also script added to storage msvc version numbers to versions.txt Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * get rid of custom 'qt' gitmodules propertyOswald Buddenhagen2017-04-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead, re-use the (also custom) 'project' property with the magic value '-' to flag modules which contain no project files at all. Change-Id: I33163c098852e1b79ad698115aac98217efe1157 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-272-0/+0
| | | | | | | | | | Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.9.0' in qt5Qt Submodule Update Bot2017-05-077-0/+0
| | | | | | | | | | Change-Id: I4d592c4749ad4ddd8a54ce186ae89682a564a5ba Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.9.0' in qt5Qt Submodule Update Bot2017-05-0633-0/+0
| | | | | | | | | | Change-Id: I3d17d880ce8a5ef4180cdbfb163df8d4f07a0398 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-0519-144/+324
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
| * | Change OS X 10.11 to run tests instead of 10.10Tony Sarajärvi2017-05-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes OS X 10.10 as a developer build target, and enables autotests on osx 10.11 developer build. Task-number: QTQAINFRA-1090 Change-Id: I0ba0a60edd7010eedd3289c400266b4cced6c133 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provisioning: disable screensaver passwordTony Sarajärvi2017-05-042-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously provisioning disabled screensaver on startup but didn't affect current session. Thus the screensaver hits the VMs while provisioning and without this commit the screen gets locked. This prevents the lock and we get to the desktop on the VMs. Change-Id: Icd783127e898ece6bebb5598ab86f12d5062eeb5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Change qt3d dependency on qtimageformats to optionalTasuku Suzuki2017-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | only examples use webp from qtimageformats. Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-05-0411-0/+0
| | | | | | | | | | | | | | | | | | | | | qttools manually updated to include compile fix. Change-Id: I4cee5023ab7c33f96ff509500b1b9db53daeaee6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | make sure that all submodule urls end in .gitOswald Buddenhagen2017-05-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | http(s) needs that. Started-by: Alvaro Denis <denisacostaq@gmail.com> Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Fix tier1 template selection for QNX 7 builds on WindowsSimon Hausmann2017-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the latest windows 10 template, not something outdated. Amends e3e30b4a2b037d6bd4140b381b8051e1a52da646 with the tier1 update from commit 070d9333a6fc768526479edd2b81bba9e030f655. Change-Id: I92bae3d971e8ad7190d883a057968a6583d34ff7 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | Platform Configurations for Visual Studio 2017Heikki Halmet2017-05-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC 2017 is pre-provisioned to tier 1 template with MSVC 2017 build tools. When winrt arm is available for msvc 2017 in qtbase it will be added to platform configurations also Change-Id: Ib33cd63a974683de080bf5734081a73ecb1dabeb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-05-022-0/+0
| | | | | | | | | | | | | | | Change-Id: I6aed41bf25a3230d2c6643dea89033ad66543c91 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Provision toolchains and take QNX 7 SDP into use with 64 bit Win10Simo Fält2017-04-303-0/+96
| | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1113 Change-Id: I7151dc89c6813ad6c37fde20b8aa641578c54d4c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-2912-0/+0
| | | | | | | | | | | | | | | Change-Id: I3b16919a9c1e93e955fd9d5e3f3a8f699fa914a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-2826-0/+0
| | | | | | | | | | | | | | | Change-Id: Id118e3a91f3ac21c01823227a17075a208202bdd Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Provision and take QNX 7 SDP into use with RHEL 7.2Simo Fält2017-04-273-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | After enabling QNX 7, we are moving some QNX 6.6 config to be ran with qt5 integration only. Task-number: QTQAINFRA-1111 Change-Id: I230b5f8b8631558ccfa156ae4f949ed045c40972 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Add preparing of qemu fontconfig to Ubuntu 16.04 provisioningSami Nurmenniemi2017-04-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If normal fontconfig paths are used, qemu parses what ever files it finds from the toolchain sysroot and the rest from the system fonts. Fix by copying the system font configurations to a location which prefix that can't be found from the toolchain sysroot. Links must also be dereferenced or their targets remain pointing to the toolchain sysroot. Task-number: QTBUG-59966 Change-Id: I9710c9fdebe81114080f47f1f59b2a049f87c070 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Provision environment variables for SSL autotestsTony Sarajärvi2017-04-272-0/+6
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-56102 Change-Id: I7f14fbebcc459b4610ca9469b4335ef5b18ba5b4 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Provision: Remove excess export that wasn't read in UbuntusTony Sarajärvi2017-04-271-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default shell for 'qt' user is Dash. It doesn't read .bashrc at all. Coin uses bash, but uses it non-interactively which in .bashrc means that it bails out immediately. So same result, .bashrc isn't read in Ubuntus. Change-Id: Id466c86f8cc813aacd5f41c4b267b44e93759377 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Add provisioning for qt3dstudio 3rdparty toolsMiikka Heikkinen2017-04-272-0/+11
| | | | | | | | | | | | | | | Change-Id: I8060b6fd89e4c188d17219f43c8789aa25713068 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.9Simon Hausmann2017-04-257-127/+108
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/provisioning/qtci-osx-10.10-x86_64/android.sh coin/provisioning/qtci-osx-10.11-x86_64/android.sh Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d
| | * Improve Android SDK/NDK installation on macOSSimon Hausmann2017-04-242-123/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unused installation on macOS 10.10 as we only build packages on 10.11. * Replace the use of the ~1GB downloads of the zip files with a direct extraction via NFS. This is more resilient to flakyness in the network connection. Change-Id: I1bfe5bbf00a6614233b517801daf130069094ec9 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * Provisioning: MSVC 2017 Build ToolsHeikki Halmet2017-04-244-5/+101
| | | | | | | | | | | | | | | | | | | | | MSVC 2017 build tools are pre-provisioned to windows 10 templates Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * ignore submodules in dirtiness checkOswald Buddenhagen2017-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | changed submodule sha1s should not prevent updating. Change-Id: Ibd4480bed91de2a04719c32c95a4c603eda4c44b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-235-0/+0
| | | | | | | | | | | | | | | Change-Id: Ic7e8b19d68ab1adb24604230e64e40353de11bd7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-143-0/+0
| | | | | | | | | | | | | | | Change-Id: I30e320be0c03efc38d0ede024f5678e3a9c4d307 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Adjust submodule branchesOswald Buddenhagen2017-04-271-41/+41
|/ / | | | | | | Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951
* | Make Java installation independent from the disks in the systemSimon Hausmann2017-04-251-1/+2
| | | | | | | | | | | | | | | | | | Assuming that the JDK dmg will always be mounted via /dev/disk1s1 breaks when another disk is present in the system and the DMG ends up at disk2 for example. Change-Id: Ia196a6ae18f455144802167c0887bf18dafbc101 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Update submodules on '5.9' in qt5v5.9.0-beta3Liang Qi2017-04-249-0/+0
| | | | | | | | | | Change-Id: Iad79cef81aba1b694e35465aa590dac529603bc6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-210-0/+0
|\ \ | | | | | | | | | Change-Id: I83b64c83c848a68637e2172a5201e8870c8a6a12
| * | Update submodules on '5.8' in qt55.8Qt Submodule Update Bot2017-04-191-0/+0
| | | | | | | | | | | | | | | Change-Id: I2dbd8467b77c1a55160396b62bf270d8cdacbb23 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.8' in qt5Qt Submodule Update Bot2017-04-191-0/+0
| | | | | | | | | | | | | | | Change-Id: Ib8ef3a21c594b3c58fe8b9f51468b3e5f5b33289 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.8' in qt5Qt Submodule Update Bot2017-04-181-0/+0
| | | | | | | | | | | | | | | Change-Id: I4aa51db4cf07e85ed69cb82fd76dae863dd55db4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.8' in qt5Qt Submodule Update Bot2017-04-141-0/+0
| | | | | | | | | | | | | | | Change-Id: I330bfe1c5c1eda6a806feef9cc3b930362245fb5 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.8' in qt5Qt Submodule Update Bot2017-04-122-0/+0
| | | | | | | | | | | | | | | Change-Id: I707f07be6b8f9238b4c6f9e79f1a9831e81f785d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.8' in qt5Qt Submodule Update Bot2017-04-118-0/+0
| | | | | | | | | | | | | | | Change-Id: I6b50e79e45b05ff3a2dc5590a87eeb593b9fa2dc Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-2122-0/+0
| | | | | | | | | | | | | | | Change-Id: I34ed33d4cedd7d70ac7c8adfdcfbc1ab459e9dbb Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Improve reliability of automated xcode installationSimon Hausmann2017-04-213-126/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of downloading a 4+GB archive and uncompressing it in /tmp, let's uncompress the archive via NFS and feed the data straight into cpio. This should be faster and avoids curl's error handling that's happy to abort instead of re-trying. Change-Id: Ifa5d842c50111ccdbd56e795b270ee6433a63adf Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Enable INTEGRITY in RHEL 7.2Tony Sarajärvi2017-04-202-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provision the INTEGRITY SDK and enable the builds for Qt5 builds. Task-number: QTBUG-59076 Task-number: QTBUG-59077 Change-Id: I448a16e45312b88eb5f710a600956c076480e253 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Add java.sh provisioning script for macOS 10.12Tony Sarajarvi2017-04-201-0/+128
| | | | | | | | | | | | | | | | | | | | | | | | Required by Android SDK. Task-number: QTQAINFRA-1094 Change-Id: I4bde075f95c57fbe919ac2a5c09e25107e8525a1 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Provision OpenSSL to macOS 10.12Tony Sarajärvi2017-04-201-0/+117
| | | | | | | | | | | | | | | Change-Id: I97d811ebbdda69f78bbd5f71ae38847a851a24fe Reviewed-by: Jake Petroules <jake.petroules@qt.io>