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

 Conflicts:
	coin/provisioning/common/linux/open62541.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
	coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh

Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128

2 files changed, 13 insertions, 0 deletions

diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
index 5cb067a7..994dedf4 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
@@ -49,6 +49,7 @@ ExceptionSetDelay=102
 ExceptionVNC=103
 ExceptionNTS=104
 ExceptionDisableScreensaverPassword=105
+ExceptionDisableSleep=106
 
 try
 (
@@ -56,6 +57,9 @@ try
     # For current session
     defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver
 
+    echo "Disable sleep"
+    sudo pmset sleep 0 displaysleep 0 || throw $ExceptionDisableSleep
+
     # For session after a reboot
     mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver
     (
@@ -126,6 +130,11 @@ catch || {
             echo "Failed to disable requiring of password after screensaver is enabled."
             exit 1;
         ;;
+        $ExceptionDisableSleep)
+            echo "Failed to disable sleep."
+            exit 1;
+        ;;
+
     esac
 }
 
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh
new file mode 100755
index 00000000..ef65edad
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/macos/python2.sh"