aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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>
* | 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>
* | | Build macOS Android builds on macOS 10.12Tony Sarajärvi2017-04-201-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Removes the build targets on macOS 10.10 and 10.11. Task-number: QTQAINFRA-1176 Change-Id: I668b74b17f48abe108673d93b6a9359dd31ce90e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Fix provision script to create sub folders if neededTony Sarajärvi2017-04-201-1/+1
| | | | | | | | | | | | | | | Change-Id: I6bec5e3adb66d0e88f611a83d05a52e6b8858b7a Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Provision Android SDK to macOS 10.12Tony Sarajärvi2017-04-201-0/+128
| | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1094 Change-Id: Ibee4e78979cdaff447c8a9d75024994ebc121572 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Update submodules on '5.9' in qt5v5.9.0-beta2Qt Submodule Update Bot2017-04-154-0/+0
| | | | | | | | | | | | | | | Change-Id: Ib3cb8cae3bbdedbaafe1e5deb3c0ca9252f010d3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.9Simon Hausmann2017-04-137-7/+167
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Icee114ea6bd025a54db7ce34d6a0bd0dc16e767c
| * | Provisioning: Change tier1 templates for Windows 10Heikki Halmet2017-04-136-6/+162
| | | | | | | | | | | | | | | | | | | | | | | | These tier 1 templates includes changes needed by 5.9, but we can use these same tier 1 templates for 5.6 also Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Fix provision help script DownloadURL.shTony Sarajärvi2017-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The script neglected the result of the sha1 after download. Even with a failure it exited nicely. Change-Id: I6c0e25c2b764a0ad54acbe317eddf395a56d7f1c Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-1312-0/+0
| | | | | | | | | | | | | | | Change-Id: Ice64fb51928fda825b63eef8e09f752c4a67395f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Add cmake location to PATH when provisioning macOS 10.12Konstantin Tokarev2017-04-121-0/+1
| | | | | | | | | | | | | | | Change-Id: I3afecaefced45704b77b461a2bc2869134567a2e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-1110-0/+0
| | | | | | | | | | | | | | | Change-Id: Id6c112e68c465ae52d49f4b35bee648894a35fef Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-1012-0/+0
| | | | | | | | | | | | | | | Change-Id: I9c5567a7b76101548b690dee3bba06fcdf11bd36 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Enable autotests for Ubuntu 16.04 and swap configsTony Sarajärvi2017-04-101-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As autotests pass, we can also move all existing Ubuntu 14.04 configurations to run on a more recent Ubuntu 16.04. Task-number: QTQAINFRA-1101 Change-Id: I99c4f674dc48521c66ac579c6bb1b5396c282131 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simo Fält <simo.falt@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.9Liang Qi2017-04-083-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules qt.pro Commit ed8f84f149f6901cbca50d145b25fe5f43a2d54c (webengine needs tools) together with commit 5656b4848e8c8bf60274c36094dede63aa93e89b (webkit needs webengine) creates a circular dependency with qttools also depending on webkit. So this commit breaks it by swapping the serialization order between webkit and webengine. Change-Id: I36309908adb754072495e02785ad158f8b389548
| * | serialize build of qtwebkit and qtwebengineOswald Buddenhagen2017-04-062-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linking both at the same time requires more than my 16GB of RAM, so introduce a .gitmodules field which serializes the two. in practice, it is just interpreted as an optional dependency. the CI system won't be taught about it, so this will not cause an unnecessary serialization there. Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | fix url normalizationOswald Buddenhagen2017-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after 8c0390143, we cannot rely on the denormalized segment starting with a slash any more. Task-number: QTBUG-59753 Change-Id: Ia3a3c005d1f41320747a60efc48a180caa88206b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Valentin Fokin <fokinv@inf.u-szeged.hu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 08:33:34 +0000