Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtdeclarative.yaml
	coin/platform_configs/qtsaferenderer.yaml
	coin/platform_configs/qtsdk.yaml
	coin/provisioning/common/linux/cmake_linux.sh
	coin/provisioning/common/windows/cmake.ps1

Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee

4 files changed, 64 insertions, 24 deletions

diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh
new file mode 100755
index 00000000..729f9003
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/unix/telegraf_install.sh
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
index ee121e92..21dde7d7 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
@@ -47,11 +47,10 @@ done
 
 function set_internal_repo {
     sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-updates main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-backports main restricted universe
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-security main restricted universe multiverse
+    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse
+    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse
+    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe
+    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse
 EOC
 }
 
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
index 4ca84072..3006af47 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
@@ -48,6 +48,7 @@ cd "$tempDir"
 git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f
 git cherry-pick 75e5b70e6b5dcc4f2219992d7cffa462aa406af0
 git cherry-pick 04b33e21866412689f18b7ad6daf0a54d8f959a7
+git cherry-pick cd8133679f7e0e2c292f631f1c78b2452d2435c7
 git submodule update --init pixman
 
 patch -p1 <<EOT
@@ -121,6 +122,43 @@ index 11a311f9db..94d8abc745 100644
 2.17.1
 EOT
 
+patch -p1 <<EOT
+From fb4f0fa319e757c083f0b3674f575a09c323f5aa Mon Sep 17 00:00:00 2001
+From: Assam Boudjelthia <assam.boudjelthia@qt.io>
+Date: Tue, 20 Aug 2019 09:46:46 +0300
+Subject: [PATCH] Suppress unsupported syscall and ioctl debug messages
+
+Those messages were spamming the CI tests output, thus they can
+only be shown by defining environment variable QEMU_SYSCALL_DEBUG=true
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 94d8abc745..e72cfb0cb5 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -5479,7 +5479,8 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+     ie = ioctl_entries;
+     for(;;) {
+         if (ie->target_cmd == 0) {
+-            gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd);
++            if (getenv("QEMU_SYSCALL_DEBUG"))
++                gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd);
+             return -TARGET_ENOSYS;
+         }
+         if (ie->target_cmd == cmd)
+@@ -12172,7 +12173,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+
+     default:
+     unimplemented:
+-        gemu_log("qemu: Unsupported syscall: %d\n", num);
++        if (getenv("QEMU_SYSCALL_DEBUG"))
++            gemu_log("qemu: Unsupported syscall: %d\n", num);
+ #if defined(TARGET_NR_setxattr) || defined(TARGET_NR_get_thread_area) || defined(TARGET_NR_getdomainname) || defined(TARGET_NR_set_robust_list)
+     unimplemented_nowarn:
+ #endif
+--
+2.17.1
+EOT
+
 ./configure --target-list=arm-linux-user,aarch64-linux-user --static --disable-werror
 make
 sudo make install
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
index f43e8fd2..c5289f45 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -44,14 +44,14 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
 echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..."
 
-versionARM="2.5.2"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-409ebc3.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package"
-SHA1="a03b4eb492b16c6e60cf83c0718c27e9cfa6d522"
+versionARM="2.6.1"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-9e1a27d.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package"
+SHA1="7c76230ef1bb58bf907daa81117d81b48534802c"
 yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
 yoctoLocationARMv7="/opt/yocto-armv7"
-sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi"
+sysrootARMv7="sysroots/armv7at2hf-neon-poky-linux-gnueabi"
 crosscompileARMv7="sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-"
 
 DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller"
@@ -62,11 +62,11 @@ rm -rf "$yoctoInstaller"
 
 echo "Installing Yocto toolchain for 64-bit b2qt ARM64..."
 
-versionARM64="2.5.2"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-409ebc3.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package"
-SHA1="3dadf1135d00f7cb5586b605b1f7344ae828c9cd"
+versionARM64="2.6.1"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-9e1a27d.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package"
+SHA1="598c24b8bcf289bb67a14aea51567c0d00bf5187"
 yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
 yoctoLocationARM64="/opt/yocto-arm64"
 sysrootARM64="sysroots/aarch64-poky-linux"
@@ -80,11 +80,11 @@ rm -rf "$yoctoInstaller"
 
 echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..."
 
-versionMIPS64="2.5.2"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-409ebc3.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package"
-SHA1="dd03b496707ca8888b339a667e021722a8c2fdb4"
+versionMIPS64="2.6.1"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-9e1a27d.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package"
+SHA1="8cea8504463ab96322e92f3c6e9e922f394ae3c7"
 yoctoInstaller="/tmp/yocto-toolchain-mips64.sh"
 yoctoLocationMIPS64="/opt/yocto-mips64"
 sysrootMIPS64="sysroots/mips64-poky-linux"
@@ -115,7 +115,7 @@ echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt
 echo "Yocto MIPS64 toolchain = $versionMIPS64" >> ~/versions.txt
 
 # List qt user in qemu toolchain sysroots
-sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/passwd"
-sudo sh -c "grep ^qt /etc/group >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/group"
+sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/etc/passwd"
+sudo sh -c "grep ^qt /etc/group >> /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/etc/group"
 sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/passwd"
 sudo sh -c "grep ^qt /etc/group >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/group"