Commit Graph

1703 Commits

Author SHA1 Message Date
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
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
Simon Hausmann
fa903eba4b Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Icee114ea6bd025a54db7ce34d6a0bd0dc16e767c
2017-04-13 21:54:47 +02:00
Heikki Halmet
e48d653150 Provisioning: Change tier1 templates for Windows 10
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>
2017-04-13 12:31:58 +00:00
Qt Submodule Update Bot
bac199faa3 Update submodules on '5.9' in qt5
Change-Id: Ice64fb51928fda825b63eef8e09f752c4a67395f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-04-13 12:23:29 +00:00
Konstantin Tokarev
aac3786d67 Add cmake location to PATH when provisioning macOS 10.12
Change-Id: I3afecaefced45704b77b461a2bc2869134567a2e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-12 08:55:39 +00:00
Qt Submodule Update Bot
4b5af2de68 Update submodules on '5.9' in qt5
Change-Id: Id6c112e68c465ae52d49f4b35bee648894a35fef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-11 16:45:57 +00:00
Tony Sarajärvi
b8211774d9 Fix provision help script DownloadURL.sh
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>
2017-04-10 17:27:24 +00:00
Qt Submodule Update Bot
d353476112 Update submodules on '5.9' in qt5
Change-Id: I9c5567a7b76101548b690dee3bba06fcdf11bd36
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-10 11:54:11 +00:00
Tony Sarajärvi
bb5139dd09 Enable autotests for Ubuntu 16.04 and swap configs
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>
2017-04-10 05:20:10 +00:00
Liang Qi
b80fa7bc4c Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	.gitmodules
	qt.pro

Commit ed8f84f149 (webengine needs tools)
together with commit 5656b4848e (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
2017-04-08 19:51:16 +00:00
Liang Qi
6720096ee0 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I908f38bd8cfcfd481f005a2588df5d3440eac9c5
2017-04-08 16:04:53 +02:00
Konstantin Tokarev
0c7c11ca56 Fix AltUrl of cmake for macOS provisioning
Change-Id: I730a65c2fcbea14bd3fe44e01a182f095d96b0ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-07 22:04:06 +00:00
Oswald Buddenhagen
5656b4848e serialize build of qtwebkit and qtwebengine
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>
2017-04-06 21:56:25 +00:00
Qt Submodule Update Bot
b91aca3ab8 Update submodules on '5.9' in qt5
Change-Id: I2ffc93d7195ab1d368a8dec8219be46acf1f74ee
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-06 17:39:47 +00:00
Simon Hausmann
c675a237f1 Remove special configuration for xmlpatterns
Commit 8b13ccf0238aecfe2a01e3a2e6d90620a8b9e516 in coin attempted to
incrementally add OpenSuSE 42.1 support module by module, and various
transitions have lead to this file. Meanwhile commit
aa7531ca7d0e8f92c49a54f11460ece647ef73f1 in coin replaced OpenSuSE 13.01
globally with 42.1 for all modules, so this separate treatment is not
needed anymore.

Change-Id: I0e162a64816f7925a5afd5a79614a1e8843d9b7e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-04-06 14:35:20 +00:00
Oswald Buddenhagen
315b76dc9b fix url normalization
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>
2017-04-06 09:20:33 +00:00
Qt Submodule Update Bot
e7fc74d781 Update submodules on '5.6' in qt5
Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-06 09:20:29 +00:00
Qt Submodule Update Bot
04ec42b9e1 Update submodules on '5.8' in qt5
Change-Id: I39b5d0e9bddc2f5519cb08ac0b7b538a49a550b4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-06 09:20:26 +00:00
Simon Hausmann
30da853b97 Enable QEMU based ARM testing for qtdeclarative with Boot2Qt
The module has been changed to run a sub-set of tests. With that in
place we can enable test execution, providing us with some CI test
coverage for the ARM JIT, for example.

Change-Id: I5b0ad68fcd4fa8fb73f59432b42ccdd9a5b6fd59
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-04-05 09:34:04 +00:00
Qt Submodule Update Bot
c55903eaa6 Update submodules on '5.9' in qt5
Change-Id: I549dc236009aadd78fb163a2a26b2384bb7de9ab
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-05 05:27:25 +00:00
Sami Nurmenniemi
e3d84a49c0 Remove fonts-noto-cjk on Ubuntu-16.04-x86_64 provision image
First test using QFont fails if fonts-noto-cjk is installed. This
happens because running fontcache for that font takes > 5 mins when
run on QEMU. Running fc-cache doesn't help since host version creates
cache for a wrong architecture and running armv7 fc-cache segfaults
on QEMU.

Change-Id: I6667b29ad4c4cae8d242e3af63defb603a6e6ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-04 05:06:46 +00:00
Liang Qi
285ee106e7 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.

Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
v5.9.0-beta1
2017-04-03 12:06:27 +00:00
Qt Submodule Update Bot
df3c9ce7da Update submodules on '5.8' in qt5
Change-Id: I9444728a1fa2c23e65a3f809767509a0854f1e2d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-02 05:13:29 +00:00
Qt Submodule Update Bot
1bb9546b48 Update submodules on '5.8' in qt5
Change-Id: I551f0a875c9c16acbcd768994051e85d9fcde47c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-01 20:23:34 +00:00
Qt Submodule Update Bot
742737bd7c Update submodules on '5.6' in qt5
Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-01 20:20:30 +00:00
Liang Qi
95223c7466 Update qtserialbus manually
Change-Id: Ic4e1200a5d75e0c7b33fcb43efb27706260e3202
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-01 07:28:35 +00:00
Qt Submodule Update Bot
30e0f087d4 Update submodules on '5.9' in qt5
Change-Id: I64a699afde6c7444abfad5d0cac19f2d1d332f7f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-01 06:39:12 +00:00
Heikki Halmet
e00cb3ac59 Provisioning: Bug fix patch for msvc 2015 update 3
This bug fix patch is needed for QtWebEngine

Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-03-31 06:42:09 +00:00
Simo Fält
8b59bbc2a4 Coin provisioning: Use arg instead of autodetecting architecture
When provisioning windows machine, it seems that detecting architecture
by checking [System.Environment]::Is64BitProcess doesn't work properly.
Instead pass 32 or 64 as an argument when calling powershell script.

Change-Id: I890ad141b8ef194275848d0e656431753463cd2b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-03-30 15:14:04 +00:00
Liang Qi
990625d8cb Update submodules on '5.9' in qt5
Change-Id: I7dfea76bca9df8ab4db1be65068ffa46b414ad3d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-30 05:43:35 +00:00
Liang Qi
bee0c1b12f Update submodules on '5.9' in qt5
Change-Id: Iefd15fd52d2300981820cb1b067f512228100503
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-28 04:45:10 +00:00
Liang Qi
0b1af0bb2f Update submodules on '5.8' in qt5
Change-Id: Icc31f52cf5a77a4100dfd63acd32e1596ead3dad
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-23 11:33:56 +00:00
Heikki Halmet
80b739b1e8 Provisioning: Move Visual Studio installation to pre-provisioning
Visual Studios will be pre-provisioned to tier1/vanilla os when visual
studio update is needed. Even if using pre-configured offline
installer with specific workload and components the installation is
still taking too long. This way we'll reduce provisioning time
significantly

Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-03-22 09:31:06 +00:00
Liang Qi
a2cd0b3102 Update submodules on '5.6' in qt5
Change-Id: I8050d2b9f1f2d3ad55f64c139410abc09f21dc6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-20 08:05:40 +00:00
Liang Qi
6d8560c63f Update submodules on '5.9' in qt5
Change-Id: Id9f9836551a35fba5ccd12be449f9c4a92acf486
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-19 18:46:59 +00:00
Liang Qi
6995b1e85d Update submodules on '5.8' in qt5
Change-Id: Ibf0175771f357c30243b5d309cfb4facc4a6b31b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-19 13:13:06 +00:00
Liang Qi
e193001bca Update submodules on '5.9' in qt5
Change-Id: I210324952a0126cd656344eebee2dbd6a32f6dc1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-18 06:43:06 +00:00
Jason Erb
084d79e8b4 Reflect current URL in example comment
Change-Id: I51091c69d2698ba23207a95d17f4748c22cd7cb7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2017-03-16 12:01:37 +00:00
Liang Qi
ce96014426 Update submodules on '5.6' in qt5
Change-Id: Ibb0fac8d2a36e6aeeb25aa91bb1a74403005205b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-16 12:01:34 +00:00
Allan Sandfeld Jensen
3e35991013 Install g++-multilib on Ubuntu 16.04 platforms
This is needed to cross-build to 32bit x86 which WebEngine needs for
Boot2Qt ARM builds.

Task-number: QTBUG-59504
Change-Id: I9851d97949dc67c6f564cf09443b0a04998b2590
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-16 06:20:01 +00:00
Tony Sarajärvi
b14198730d Remove command line tools from macOS 10.11 and 10.12
Qt should not require command line tools to be installed.
When they are installed, we can accidentally rely on
on the tools instead of sysroot.

Task-number: QTBUG-58325
Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-15 13:21:40 +00:00
Liang Qi
e7c6dcdb32 Update submodules on '5.8' in qt5
Change-Id: Iac3e9b6581b2bb490c8c58ccf50cd4f14b6651a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-15 06:46:50 +00:00
Paolo Angelelli
88e87fe7d3 Recommend qtquickcontrols2 for qtlocation
The MapViewer example now uses qtquickcontrols2 sliders.
This patch adds the related dependency

Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2017-03-14 07:03:14 +00:00