Commit Graph

1916 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
5c7ccdbc83 Update submodules on '5.9' in qt5
Change-Id: Ic685ba43f99c41edd5727cfe4fcc823d544f2f6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-19 09:28:36 +00:00
Tony Sarajärvi
128075f744 Fix typo in echoing version to versions.txt
Change-Id: I36f9f9181fcf60774766f122e6f5526f62c8c249
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:17 +00:00
Joni Jäntti
4cdfd8e902 Make 7zip provisioning script add 7zip to path
7zip is nice to have in path for future purposes such as when
cherry-picking to other branches where we use different
extracts scripts.

Change-Id: I40b0f8568e285d85927ad30365c0ab9224e21332
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:15 +00:00
Joni Jäntti
e8fc216658 Make Extract-7zip helper function work with the new provision location
Changed the helper function for extracting 7z files so that it also
supports the new C:\Utils\sevenzip location.

Change-Id: I4f2dafc4ccac71e2cd8a3c8148df4888f800484f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-17 16:57:12 +00:00
Joni Jäntti
e09dc71d25 Make Ninja provisioning use Add-Path function
We should use this helper function now that we have it.

Change-Id: I9a522533795d4d4e63f608a0624378f066055b10
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:09 +00:00
Joni Jäntti
a26ce5e56a Make CI use a new provisioned Win 10 template
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: I0f3d1072d53eb75f7405cf79139f2919eeb1f716
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:07 +00:00
Qt Submodule Update Bot
a1958e911c Update submodules on '5.9' in qt5
Change-Id: I801d03778533471c15db148fdb9d44cbc37e249f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-14 05:37:19 +00:00
Liang Qi
f63fc8ca25 Merge remote-tracking branch 'origin/5.9.2' into 5.9
Conflicts:
	.gitmodules

Change-Id: I2a20f7682f088a6ff1dd1fdb987b0bde3844d2ce
2017-10-11 10:31:05 +02:00
Qt Submodule Update Bot
388747cb1a Update submodules on '5.9' in qt5
Change-Id: Ic7ba6fa7ab6eb9cf76b07164ce93607798eaa5b1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-10-11 07:51:10 +00:00
Qt Submodule Update Bot
26ba2cdc5d Update submodules on '5.9.2' in qt5
Change-Id: I8bc573e915e725e784789f0e3ddbd40add801b42
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.9.2
2017-10-03 14:03:55 +00:00
Qt Submodule Update Bot
b37ff601f5 Update submodules on '5.9.2' in qt5
Change-Id: I17daa24ba582f0fe85097f04e48a6bc6378a1b3c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2017-10-02 18:13:31 +00:00
Tony Sarajärvi
2a650c49ee Provisioning: Fix usage of DownloadURL to throw errors
In case DownloadURL failed it's shasum check, it printed an error
and threw an exit 1. This exit 1 was never handled in the calling
scripts and went ignored. It was also not passed forward as
it was inside a try-catch statement.

Change-Id: Iae4fd6aefb75c07623ec86dc570f0a46fec659b4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-30 12:21:16 +00:00
Tony Sarajärvi
cda49ad060 Remove duplicate MinGW 5.3 provisioning
Change-Id: Ia127315ab99c902a27d24334f13e50ff23d5ddd6
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-30 12:21:01 +00:00
Tony Sarajärvi
8a93a8fe6a Provisioning: cleanup path from cmake_linux.sh
Change-Id: Iced9f0c7811b9de076aee115502de0841c1a59cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-30 12:20:39 +00:00
Qt Submodule Update Bot
9f69da6575 Update submodules on '5.9' in qt5
Change-Id: I18b9043156b97206500c2aa7375cf80b55623044
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-29 03:12:42 +00:00
Qt Submodule Update Bot
3fe0d212a5 Update submodules on '5.9' in qt5
Change-Id: I9481fbac3934de35e731eaf4ca9e3d907b19a303
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-27 20:38:23 +00:00
Joni Jäntti
0e4d668e35 Add official URL to MinGW Windows 10 provisioning
MinGW currently uses only internal URL without backup. Added the
official URL to these scripts with SHA1 checksum verification.

Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-27 06:04:11 +00:00
Simo Fält
0b251bbdc0 Provisioning: Install Python3 development libs to OpenSUSE
Those are required to build Pyside#5.9 branch.

Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2017-09-26 07:30:25 +00:00
Qt Submodule Update Bot
28ffb0ce8a Update submodules on '5.9' in qt5
Change-Id: I67e1530a32c84d0eb3b9bbb702922a6ae4f20362
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-26 06:06:18 +00:00
Qt Submodule Update Bot
6d20c60b75 Update submodules on '5.9.2' in qt5
Change-Id: I7d9d8fc249fc315ab67382fdb1de77daacb1e30d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-25 17:31:19 +00:00
Heikki Halmet
512f8ff0a2 Change Packaging and iOS builds to macOS 10.12
This changes swap packaging and iOS builds
from 10.10 to 10.12

Task-number: QTQAINFRA-1095
Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-25 09:10:31 +00:00
Qt Submodule Update Bot
51c2673304 Update submodules on '5.9' in qt5
Change-Id: I35d02c6c8d6ce01d10d094302782d81713163ded
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-24 19:29:34 +00:00
Liang Qi
04ccf0e8db Merge remote-tracking branch 'origin/5.6' into 5.9
42b502f is not needed for branches >= 5.8, configure.exe does not
exist anymore.

30660bf was not applied to 5.9 branch, the scripts were not
adapted to new template.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
2017-09-22 21:15:52 +02:00
Qt Submodule Update Bot
6c4eb77aa0 Update submodules on '5.9' in qt5
Change-Id: If34cf07aad9b4b3a539223dd37c40c799ffb7ba3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-22 12:30:54 +00:00
Oswald Buddenhagen
4cee1be86b Adjust submodule branches
Change-Id: I4cf45c3fb92fadf5724e0941789a7fa545625753
2017-09-20 12:28:58 +02:00
Qt Submodule Update Bot
6dd41c8406 Update submodules on '5.9' in qt5
Change-Id: I46cf8a6f861952ceed6a36ae1b2cb7ca2b103fb8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-18 10:32:58 +00:00
Liang Qi
e7472f4308 Merge remote-tracking branch 'origin/5.6.3' into 5.6
Conflicts:
	.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
2017-09-18 09:42:25 +02:00
Simon Hausmann
57043fb07b Clean up QNX patching
Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches
from ci-files01 instead.

Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-16 05:35:10 +00:00
Heikki Halmet
12fd0d5b9b Ensure 'clean' android Installation
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>
v5.6.3
2017-09-15 10:38:24 +00:00
Tony Sarajärvi
b0a9259c6e Provision and build QNX660 on Win 10 x64
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>
2017-09-14 12:08:39 +00:00
Tony Sarajärvi
2a5f54d07e provisioning: install MinGW 530 and 630 for Win10 x64
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>
2017-09-14 12:08:36 +00:00
Tony Sarajärvi
892833cda9 Provisioning: Invoke installer with Start-Process
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>
2017-09-14 12:08:32 +00:00
Tony Sarajärvi
a9cf936a63 Provision: Move Python3 scripts from win8 to win8.1 folder
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>
2017-09-14 12:08:28 +00:00
Qt Submodule Update Bot
b38e4732af Update submodules on '5.6.3' in qt5
Change-Id: I44fb9a11d14313805600ffa2f55a8f465f2307bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-14 12:08:24 +00:00
Liang Qi
4b0e2f79c1 Update submodules on '5.9' in qt5
Change-Id: I352ed23b7e7a025b1e1730f15a5c0ecc60497c52
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-13 06:45:03 +00:00
Simon Hausmann
b1c268a8eb Build examples also on Linux with namespaces
With this change we get coverage for namespace related build breakages
in examples of Linux-only modules, such as wayland.

Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-09-12 16:20:51 +00:00
Dominik Holland
528580bbcd Install python3 on all platforms
This forward-ports commit a99d3432f7
to 5.9, which should have been done in
6bf5691ca8 but accidentally left out.
It reuses parts of commit a5f3f8ed48
that was initially cherry-picked to 5.6.

Task-number: QTAUTO-345
Task-number: QTBUG-63133
Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-12 13:59:10 +00:00
Liang Qi
b6e6882bb7 Update submodules on '5.9' in qt5
Change-Id: I9897024607ffd0e320ad56fa8ab1d9d4ceacc6c2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-11 18:46:00 +00:00
Simo Fält
92d1bdcb43 Provisioning: Fix shasum path
Commit c48355ebb5 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>
2017-09-08 04:34:41 +00:00
Qt Submodule Update Bot
fba2c6f4dd Update submodules on '5.6.3' in qt5
Change-Id: Idc2fc0d0cc1df4929c783116169f95210baa4b70
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-07 14:34:28 +00:00
Qt Submodule Update Bot
88d718d381 Update submodules on '5.6.3' in qt5
Change-Id: Ic62656a48bcee76ff38849671ca3fbad7e58fc73
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-07 03:10:26 +00:00
Tony Sarajärvi
8852587991 Provision openSUSE 42.3 and add to CI
Replaces 42.1 that isn't supported anymore by
openSUSE.org.

Task-number: QTQAINFRA-1257
Task-number: QTQAINFRA-1259
Change-Id: I660f812ec27a28d413dc52657985c41d1b8dab01
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-06 06:13:06 +00:00
Qt Submodule Update Bot
bcd7f921f8 Update submodules on '5.9' in qt5
Change-Id: I96537e757b58500804180cb579d4777e6abbfc96
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-06 06:13:03 +00:00
Konstantin Tokarev
6dfd0c7b38 Use 64-bit host for VS2017 builds of QtWebKit
Change-Id: I92bec3662bf39fb5a3572f093af09b2b75bda589
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-09-05 13:46:17 +00:00
Simo Fält
c48355ebb5 Provisioning: Fix DownloadURL utility's shasum check
MacOS 10.10 has older shasum tool, which does not support oneliner
verification.

Change-Id: If00b846d5772aa1991960675d022249d63e7bd77
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-05 11:36:43 +00:00
Frederik Gladhorn
73834c7166 Adjust submodule branches 2017-09-04 17:38:58 +02:00
Simo Fält
a3f4bf703b Provisioning: Fix helper function's mktemp in macOS 10.10
It seems that macOS 10.10 has a non standard mktemp command. It doesn't
work as expected but prints usage and exit instead.

Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-04 14:23:05 +00:00
Tony Sarajärvi
a7b1b00350 Provisioning: Hide powershell progress bar for performance
Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-04 12:12:17 +00:00
Joni Jäntti
dbf737a5c0 Fix Add-Path helper function and start using it in scripts
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>
2017-09-04 12:11:17 +00:00
Akseli Salovaara
4e1f4665c5 Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host
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>
2017-09-04 07:10:14 +00:00