Commit Graph

1749 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
5bb74ad51f Update submodules on '5.9.0' in qt5
Change-Id: I4e4d240d00a9696f264d2e4f5fb1e76e2545710c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
v5.9.0 v5.9.0-rc2
2017-05-27 05:06:31 +00:00
Qt Submodule Update Bot
4d6b04db3c Update submodules on '5.9.0' in qt5
Change-Id: I4b682b41b9d42a95c9d7837a0c9d2a5cd1b16d0a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
v5.9.0-rc1
2017-05-22 20:36:56 +00:00
Qt Submodule Update Bot
d2430f9e6f Update submodules on '5.9.0' in qt5
Change-Id: I59a75557095d67dad5cf36f78fb86eb17cd05513
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-20 19:22:51 +00:00
Liang Qi
90e14cf194 Update qtlocation manually
Change-Id: Ief99f6b991ea0fbfc2c0d019b68835db36539587
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-19 15:31:00 +00:00
Qt Submodule Update Bot
9b9b3817b1 Update submodules on '5.9.0' in qt5
Change-Id: Ifc375a6978c7d8fc89396b7bfbebb18f90d59b37
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-05-19 03:48:11 +00:00
Heikki Halmet
d514585213 Enable WinRT builds for MSVC 2017
All 2017 configurations are added to qt5.txt for now.

Change-Id: I4745c61a99891e2fc6d8b381b4aa831150fb4596
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.9.0-beta4
2017-05-11 12:16:23 +00:00
Liang Qi
41379a50c7 Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
2017-05-08 08:35:30 +02:00
Qt Submodule Update Bot
f5754fd722 Update submodules on '5.9.0' in qt5
Change-Id: I4d592c4749ad4ddd8a54ce186ae89682a564a5ba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-07 18:36:31 +00:00
Qt Submodule Update Bot
73a9754842 Update submodules on '5.9.0' in qt5
Change-Id: I3d17d880ce8a5ef4180cdbfb163df8d4f07a0398
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-06 17:32:39 +00:00
Oswald Buddenhagen
8d2f6c17f9 Merge remote-tracking branch 'origin/5.9' into 5.9.0
Conflicts:
	.gitmodules

Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
2017-05-05 11:22:54 +02:00
Tony Sarajärvi
4f4de8aa16 Change OS X 10.11 to run tests instead of 10.10
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>
2017-05-05 04:34:47 +00:00
Tony Sarajärvi
7937eb2d9e Provisioning: disable screensaver password
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>
2017-05-04 17:37:00 +00:00
Tasuku Suzuki
933688fc39 Change qt3d dependency on qtimageformats to optional
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>
2017-05-04 17:36:51 +00:00
Qt Submodule Update Bot
c1dd36f4d1 Update submodules on '5.9' in qt5
qttools manually updated to include compile fix.

Change-Id: I4cee5023ab7c33f96ff509500b1b9db53daeaee6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-04 17:36:44 +00:00
Heikki Halmet
a4a7f71f37 MSVC 2017 updated and missing component for winrt arm
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>
2017-05-03 09:51:17 +00:00
Oswald Buddenhagen
40b07da194 make sure that all submodule urls end in .git
http(s) needs that.

Started-by: Alvaro Denis <denisacostaq@gmail.com>
Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-05-02 17:16:25 +00:00
Simon Hausmann
4ee0e8fb46 Fix tier1 template selection for QNX 7 builds on Windows
Use the latest windows 10 template, not something outdated.
Amends e3e30b4a2b with the tier1 update
from commit 070d9333a6.

Change-Id: I92bae3d971e8ad7190d883a057968a6583d34ff7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-05-02 17:16:22 +00:00
Heikki Halmet
385ecebe80 Platform Configurations for Visual Studio 2017
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>
2017-05-02 17:16:19 +00:00
Qt Submodule Update Bot
5af86c74b2 Update submodules on '5.9' in qt5
Change-Id: I6aed41bf25a3230d2c6643dea89033ad66543c91
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-02 05:09:20 +00:00
Simo Fält
e3e30b4a2b Provision toolchains and take QNX 7 SDP into use with 64 bit Win10
Task-number: QTQAINFRA-1113
Change-Id: I7151dc89c6813ad6c37fde20b8aa641578c54d4c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-30 06:47:27 +00:00
Qt Submodule Update Bot
ed7ceee87d Update submodules on '5.9' in qt5
Change-Id: I3b16919a9c1e93e955fd9d5e3f3a8f699fa914a5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-29 19:47:21 +00:00
Qt Submodule Update Bot
f436db11bb Update submodules on '5.9' in qt5
Change-Id: Id118e3a91f3ac21c01823227a17075a208202bdd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-28 11:48:42 +00:00
Oswald Buddenhagen
8325f2bde9 Adjust submodule branches
Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951
2017-04-27 12:34:03 +02:00
Simo Fält
e0764f873b Provision and take QNX 7 SDP into use with RHEL 7.2
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>
2017-04-27 10:25:59 +00:00
Sami Nurmenniemi
94e22fcd94 Add preparing of qemu fontconfig to Ubuntu 16.04 provisioning
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>
2017-04-27 10:25:56 +00:00
Tony Sarajärvi
ed39e440a9 Provision environment variables for SSL autotests
Task-number: QTBUG-56102
Change-Id: I7f14fbebcc459b4610ca9469b4335ef5b18ba5b4
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2017-04-27 10:25:52 +00:00
Tony Sarajärvi
fb67cd8ef0 Provision: Remove excess export that wasn't read in Ubuntus
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>
2017-04-27 10:25:49 +00:00
Miikka Heikkinen
c3d2bd97bf Add provisioning for qt3dstudio 3rdparty tools
Change-Id: I8060b6fd89e4c188d17219f43c8789aa25713068
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-27 10:25:47 +00:00
Oswald Buddenhagen
2715a17c9b get rid of custom 'qt' gitmodules property
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>
2017-04-27 04:17:42 +00:00
Qt Submodule Update Bot
c33f28bc05 Update submodules on '5.6' in qt5
Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-27 04:17:39 +00:00
Simon Hausmann
070d9333a6 Merge remote-tracking branch 'origin/5.6' into 5.9
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
2017-04-25 12:37:26 +02:00
Simon Hausmann
9884a4e98e Make Java installation independent from the disks in the system
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>
2017-04-25 04:56:11 +00:00
Simon Hausmann
2ea45a59a7 Improve Android SDK/NDK installation on macOS
* 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>
2017-04-24 19:19:00 +00:00
Liang Qi
69da4dda48 Update submodules on '5.9' in qt5
Change-Id: Iad79cef81aba1b694e35465aa590dac529603bc6
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.9.0-beta3
2017-04-24 14:48:34 +00:00
Heikki Halmet
370fdfcefd Provisioning: MSVC 2017 Build Tools
MSVC 2017 build tools are pre-provisioned to windows 10 templates

Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-24 05:17:04 +00:00
Oswald Buddenhagen
3ea073ada1 ignore submodules in dirtiness check
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>
2017-04-23 11:19:48 +00:00
Qt Submodule Update Bot
c6189f9723 Update submodules on '5.6' in qt5
Change-Id: Ic7e8b19d68ab1adb24604230e64e40353de11bd7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-23 11:19:46 +00:00
Liang Qi
e3b940d7e8 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I83b64c83c848a68637e2172a5201e8870c8a6a12
2017-04-21 11:40:18 +02:00
Qt Submodule Update Bot
6366979b15 Update submodules on '5.9' in qt5
Change-Id: I34ed33d4cedd7d70ac7c8adfdcfbc1ab459e9dbb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-21 06:22:22 +00:00
Simon Hausmann
ce9181a964 Improve reliability of automated xcode installation
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>
2017-04-21 06:22:10 +00:00
Tony Sarajärvi
6b086604c1 Enable INTEGRITY in RHEL 7.2
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>
2017-04-20 05:20:54 +00:00
Tony Sarajarvi
f2467e5a48 Add java.sh provisioning script for macOS 10.12
Required by Android SDK.

Task-number: QTQAINFRA-1094
Change-Id: I4bde075f95c57fbe919ac2a5c09e25107e8525a1
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:30:06 +00:00
Tony Sarajärvi
3d27db23fd Provision OpenSSL to macOS 10.12
Change-Id: I97d811ebbdda69f78bbd5f71ae38847a851a24fe
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:29:57 +00:00
Tony Sarajärvi
e01ac750ac Build macOS Android builds on macOS 10.12
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>
2017-04-20 03:29:45 +00:00
Tony Sarajärvi
9dfab7c1bd Fix provision script to create sub folders if needed
Change-Id: I6bec5e3adb66d0e88f611a83d05a52e6b8858b7a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:29:36 +00:00
Tony Sarajärvi
79cc848ab8 Provision Android SDK to macOS 10.12
Task-number: QTQAINFRA-1094
Change-Id: Ibee4e78979cdaff447c8a9d75024994ebc121572
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:29:23 +00:00
Qt Submodule Update Bot
f19d2c9622 Update submodules on '5.8' in qt5
Change-Id: I2dbd8467b77c1a55160396b62bf270d8cdacbb23
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-19 11:25:59 +00:00
Qt Submodule Update Bot
04ab94c781 Update submodules on '5.8' in qt5
Change-Id: Ib8ef3a21c594b3c58fe8b9f51468b3e5f5b33289
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-19 10:23:39 +00:00
Qt Submodule Update Bot
2c8fbe418c Update submodules on '5.8' in qt5
Change-Id: I4aa51db4cf07e85ed69cb82fd76dae863dd55db4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-18 06:59:49 +00:00
Qt Submodule Update Bot
ada6b66011 Update submodules on '5.9' in qt5
Change-Id: Ib3cb8cae3bbdedbaafe1e5deb3c0ca9252f010d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
v5.9.0-beta2
2017-04-15 06:55:38 +00:00