Merge remote-tracking branch 'origin/5.9' into 5.10

Change-Id: I71b7fd09cd8f1c7e64531eec8a645c06a7066325

6 files changed, 18 insertions, 6 deletions

diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh
index 76db19d4..a7b83fd7 100755
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -88,7 +88,7 @@ try
     fi
 
     echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
-    if [ "$proxy" != "" ]; then
+    if [ "$http_proxy" != "" ]; then
         proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1)
         proxy_port=$(echo $proxy | cut -d':' -f3)
         echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh
index 98af57c8..7154d822 100755
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -37,7 +37,6 @@
 
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
-# shellcheck source=InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
index 90b32d0d..fc07e6fa 100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
@@ -37,6 +37,6 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
-if [ "$proxy" != "" ]; then
+if [ "$http_proxy" != "" ]; then
     echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
 fi
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
index a7718d96..bf97a166 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
@@ -51,6 +51,6 @@ gsettings set org.gnome.desktop.screensaver lock-enabled false
 # disable blank screen power saving
 gsettings set org.gnome.desktop.session idle-delay 0
 
-if [ "$proxy" != "" ]; then
+if [ "$http_proxy" != "" ]; then
     echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
 fi
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
index 6c198b1d..e00e2498 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
@@ -47,6 +47,7 @@ ExceptionGsettings2=101
 ExceptionGsettings3=102
 ExceptionNTS=103
 ExceptionProxy=104
+ExceptionGrub=105
 
 try
 (
@@ -58,11 +59,14 @@ try
     gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2
     echo "Disable questions on shutdown."
     gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3
+    echo "Set grub timeout to 0"
+    sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub || throw $ExceptionGrub
+    sudo update-grub || throw $ExceptionGrub
 
     echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
     echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS
 
-    if [ "$proxy" != "" ]; then
+    if [ "$http_proxy" != "" ]; then
         echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy
     fi
 )
@@ -84,6 +88,10 @@ catch || {
             echo "Failed to disable questions on shutdown."
             exit 1;
         ;;
+        $ExceptionGrub)
+            echo "Failed to set grub timeout."
+            exit 1;
+        ;;
         $ExceptionNTS)
             echo "Failed to set network teset server address into /etc/hosts."
             exit 1;
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
index 4ebc1b44..c0e7b8e9 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
@@ -7,13 +7,18 @@ source $BASEDIR/../common/shared/network_test_server_ip.txt
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
+echo "Set grub timeout to 0"
+sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
+sudo update-grub
 
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"
 echo 'export DISPLAY=":0"' >> ~/.bashrc
+echo "Disabling file indexing."
+sudo balooctl disable
 
-if [ "$proxy" != "" ]; then
+if [ "$http_proxy" != "" ]; then
     sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy
     sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy
 fi