Commit Graph

4592 Commits

Author SHA1 Message Date
Heikki Halmet
beb73056c3 Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-26 02:00:23 +00:00
Liang Qi
bc16944191 Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Conflicts:
	.gitmodules
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh

Change-Id: I3bfaa9531a4b62426ec276c764ffda5cffcbdcaa
2017-11-25 16:40:50 +01:00
Qt Submodule Update Bot
fdfe9e05ba Update submodules on '5.10' in qt5
Change-Id: Ibcd840cc4135dc1860facbe2176555662eabc55a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-25 15:37:24 +00:00
Allan Sandfeld Jensen
9a9d798ce4 Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: Ieed87170eccc288523bc966dab1a25025c37abfa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-25 13:26:30 +00:00
Qt Submodule Update Bot
f60bc7aa9d Update submodules on '5.10' in qt5
Change-Id: I76ddfac0ffac176a5d63b83bf13c4bacac8babbe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-24 06:46:36 +00:00
Qt Submodule Update Bot
f113a65c6e Update submodules on '5.10' in qt5
Change-Id: Ib454b91cd68ec6c109fe007b6667771a006ee95c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-23 17:28:14 +00:00
Qt Submodule Update Bot
5a4b7a56b8 Update submodules on '5.10.0' in qt5
Change-Id: Ia7b0ea9299a26d9e10a859e8d977d24f9cc22dde
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-23 12:46:44 +00:00
Qt Submodule Update Bot
e6ddce15c3 Update submodules on '5.10' in qt5
Change-Id: I12db3b69a01215489142b271976e33050874bf5b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-22 07:52:43 +00:00
Qt Submodule Update Bot
9468be52db Update submodules on '5.9' in qt5
Change-Id: I60dd3f3e809e3c82bc3216948e8a487c77ebb890
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-21 09:20:21 +00:00
Qt Submodule Update Bot
5d6f3486bc Update submodules on '5.10.0' in qt5
Change-Id: I29389744d77591850f3b50ba5bec3b97bd5865b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-21 09:19:30 +00:00
Qt Submodule Update Bot
208baeb301 Update submodules on '5.10' in qt5
Change-Id: I6c6623f1d66a65e6d3eadeda6acb2bfee9996b6d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-20 20:10:15 +00:00
Liang Qi
47bf73f4d0 Merge remote-tracking branch 'origin/5.10' into 5.10.0
Change-Id: I42aa9ce33260d7ea1cd51ac5ba1bf525f92d1185
2017-11-20 13:54:12 +01:00
Qt Submodule Update Bot
63bda0c988 Update submodules on '5.9.3' in qt5
Change-Id: I88eccfead04f469fe0fae41ac2a8bd8c3bbf1a3b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.9.3
2017-11-19 06:57:15 +00:00
Liang Qi
35db040229 Update qtwebengine only
Change-Id: I3f5934b4787c7206391cbfaa305138df447b1d23
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-19 06:55:22 +00:00
Qt Submodule Update Bot
0ec6aad455 Update submodules on '5.9' in qt5
Change-Id: I1784fb95e461ceba61f8a91a410407f43116631b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-17 10:36:31 +00:00
Liang Qi
062b29b311 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
2017-11-16 23:14:25 +01:00
Liang Qi
26fda37639 Update submodules on '5.10' in qt5
Change-Id: I92ef03c6036b4391aa9c380c1b55b9ac388a3b07
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-16 08:51:10 +00:00
Qt Submodule Update Bot
ecc7d251fa Update submodules on '5.9.3' in qt5
Change-Id: Id2262d4cad8e8ee526365d221c8620a7cd3ac053
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-16 08:29:30 +00:00
Joni Jäntti
08765d9258 provisioning: RHEL7.4: Add Python3
Python3 is currently not installed in RHEL7.4 provisioning.

Change-Id: I788b7f40ab7731f50f98f15defaac13f0296b54e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-16 08:29:22 +00:00
Qt Submodule Update Bot
f0dd13f05a Update submodules on '5.9.3' in qt5
Change-Id: I887eab07a2d6d7b0314d14371c329edf1251d2a5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-15 05:17:24 +00:00
Qt Submodule Update Bot
329d718a19 Update submodules on '5.9' in qt5
Change-Id: I35e62f9e2869d95d2432e369dc69f57262925741
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-13 22:15:03 +00:00
Tony Sarajärvi
f84bab04f7 Remove unneeded provisioning scripts
Change-Id: Ie8ff5810f07528fd23044e1b1396fc4fdde58283
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-13 22:14:52 +00:00
Maurice Kalinowski
4096e387f0 OpcUA: Add Open62541 Support
Open62541 is a new backend added to the Qt OpcUA module. Furthermore,
this is going to be used as new test server to verify changes against.

Change-Id: Id08c91644f33734318925d84fb22b0d011604dd9
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2017-11-13 04:53:30 +00:00
Konstantin Tokarev
c016a01b4c Conan: fix names of ICU dll's which are added to qtwebkit binary package
Change-Id: I5e6357e8dc0e5ae44447bc13cfba8429b89934e7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:56 +00:00
Joni Jäntti
841cf6893a Make QtWebKit builds use vanilla Win 10 x64 template
QtWebKit build targets are currently using the old non-vanilla template
for Windows 10 x64.

Change-Id: I67c536bc86939508cb8056ac3b7372096274fa69
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:52 +00:00
Heikki Halmet
6309243064 Provisioning: Install expect
Expect is needed by Release Test Automation (RTA) to automate
configure testing.

Change-Id: I66889c70667a12f962cbea39906bd8b7a1d63517
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:49 +00:00
Tony Sarajärvi
d56552566f Provisioning: FBX SDK
We need to provision the FBX SDK for Qt3DStudio.

Task-number: QTQAINFRA-1449
Change-Id: I52587cd653b7954340d5f58978ffbd008330337c
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:46 +00:00
Qt Submodule Update Bot
f789a8004a Update submodules on '5.9.3' in qt5
Change-Id: I035628fed6f03353fd754ec21a293394709a0ce3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-11 14:58:32 +00:00
Heikki Halmet
a8bd91bc27 Provisioning: Remove old cmake before installing new one
Windows 10 x86 isn't yet vanilla so provisioning needs to remove old
cmake before installation

Change-Id: I2712aaa652492520d68a597d99a3c2d6bdbe2433
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 14:58:17 +00:00
Liang Qi
d0df4f2ce9 Merge remote-tracking branch 'origin/5.9' into 5.9.3
Change-Id: I2bb4b5d5b507c6586a9f9f7f2765d5f102ad180b
2017-11-11 12:57:00 +01:00
Jan Arve Sæther
3653630d22 Provisioning: Disable NTP synchronization for Windows
During CI, it has been observed that some processes didn't leave their
wait state. (So they were "hanging")
During analysis of the event log on that CI node, we found out that at the
same time those processes entered this state, the NTP client set a new time
and indeed the local time of the CI node changed (it was
changed 2 hours forward in our case).
For the record, the processes we observed this with was jom.exe and
cc1plus.exe (the latter is the g++ compiler in the mingw toolchain)).

We therefore have a strong suspicion that the NTP time change was causing
the CI hang, so we simply disable it.
The virtual machine should anyway get the correct time from its VM host
when its started.

Change-Id: I1204063399e2a4741b7b26b79858759c1bc5eab2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-11-10 23:29:49 +00:00
Liang Qi
90272a84ae Merge remote-tracking branch 'origin/5.9' into 5.10
Also update to pyro toolchain in QEMU way.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh

Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
2017-11-09 14:05:56 +01:00
Heikki Halmet
60fb3cb272 Provisioning: Install signing tools to MacOS
Install needed certificates and signing tools which are
needed when signing release packages

Change-Id: I21b9c3d1a6b4c83dec6b8ae1674def4ecc02f444
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-09 04:23:52 +00:00
Heikki Halmet
ada909932d Provisioning: Update Java to version 8
Current version of Java isn't installing correctly during provisioning.
Silent installation needs parameters which are added to script. Without
those the installation process tries to open Java3BillDevices.jpg
unsuccessfully and the installation fails

Task-number: QTQAINFRA-1498
Task-number: QTQAINFRA-1394
Change-Id: I5672d230eb348186345887da81cdd97a4f59bce8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-09 04:23:43 +00:00
Joni Jäntti
537ea17d14 Fix Ubuntu 16.04 random provisioning fail
Ubuntu 16.04 provisioning sometimes fails in the apt-get commands for
package installations. This is caused by a lock that is still in use
when the system is calling the apt-get commands.

This change will use the apt daemon to queue the install commands
and wait for the lock to release instead of checking once and then
failing if the lock is not open.

Task-number: QTQAINFRA-1502
Change-Id: Idd4aff42f99cf4d14c08aef8fcc3cb7dbc58b2dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-08 11:50:25 +00:00
Liang Qi
207494b1d3 Update submodules on '5.9' in qt5
Change-Id: I038001efcd21e74f02786441c4a30c81d30d1336
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-08 10:00:31 +00:00
Qt Submodule Update Bot
ee4b7e638b Update submodules on '5.9.3' in qt5
Change-Id: I1ff81c92c5e273e423788b3d0fff9afcaec23549
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-08 05:33:39 +00:00
Qt Submodule Update Bot
b0eddcbae6 Update submodules on 'dev' in qt5
Change-Id: Iec4f8b9f7178a8d2bc0f848752db976191e14331
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-08 04:51:40 +00:00
Oswald Buddenhagen
94ce420956 Adjust submodule branches
Change-Id: Ia4636256e7797beffbbdddb21f2f6b4839e1020b
2017-11-07 16:58:57 +01:00
Heikki Halmet
0e278c4e95 Provisioning: Remove logical OR when echo errors
set -e won't work if logical OR is used after commands. These error
echo's need to be removed so that error catch will works. Also set -ex
added to print executed command when error caught.

Task-number: QTQAINFRA-1533
Change-Id: Ib4ea832a0ee813f99f59ebacad51ec57c3eff57d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-07 15:25:12 +00:00
Tony Sarajärvi
894c63834b Fix spelling of ANDROID_SDK_HOME
It was incorrectly created at ANDROID_SDK_ROOT,
but Coin doesn't use that env variable. It uses _HOME.

Change-Id: I64b8befd4341e917c7aa28586ac8bf1dbf4e23a4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-07 15:25:04 +00:00
Qt Submodule Update Bot
f1a9b684bf Update submodules on '5.10' in qt5
Change-Id: I88d2003d82ca37105d351d00c255e8f6ab303529
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.10.0-beta4
2017-11-07 03:52:53 +00:00
Joni Jäntti
e3deccd936 Yocto toolchain provisioning to CI
Provisioning scripts need to install Yocto toolchains (32 and 64 bit)
so that the artifacts aren't needed to be unzipped during Qt builds.

Task-number: QTQAINFRA-1454
Change-Id: Idceeabb7aa9ffe2555fb98c94916f8429c32af75
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-06 07:56:18 +00:00
Qt Submodule Update Bot
f132490a61 Update submodules on '5.9' in qt5
Change-Id: I07353da970e5939cfba760c23b11d74d2de02a9c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-06 07:56:14 +00:00
Qt Submodule Update Bot
59ee506fe6 Update submodules on 'dev' in qt5
Change-Id: Icf103970bed93741218f7e3165ede8852672eaef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-05 09:14:08 +00:00
Liang Qi
0aecf8a1df Update qtwebengine only
Change-Id: Ib0480653a5afc9fbf202a5e0108a4536a1ec9f92
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-05 07:24:19 +00:00
Jani Heikkinen
e70e81a4aa Merge remote-tracking branch 'origin/5.9' into 5.9.3
Change-Id: If3754a87a42cc51f3a972d227056ab5eb2ef4a49
2017-11-03 14:37:24 +02:00
Jesus Fernandez
4a4589d878 Don't recommend QtWebView in QtNetworkAuth module
QtWebView is not used in QtNetworkAuth. There is no need to recommend
the QtWebView module.

Change-Id: I2dbb9d4024ada9436725f4dac643574b558fb9ae
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-03 11:08:25 +00:00
Heikki Halmet
6275ed9d70 Provisioning: Fix p7zip installation
Change-Id: Id6847ee203fdee03c6db067a952f9da5188d3d5c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-11-03 07:15:41 +00:00
Joni Jäntti
03d6b7b36a Fix Windows 8 libclang script locations
Currently for some reason there exist both "windows-8" and
"windows-8.1" folders in coin/provisioning/. "windows-8" folders
contain only the libclang provisioning scripts. These should be under
"windows-8.1" since "windows-8" shouldn't exist anymore.

Change-Id: I19ca70079c19cebd0482cf2d7502894648f19267
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-11-03 07:15:38 +00:00