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

 Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f

4 files changed, 17 insertions, 4 deletions

diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 468451e9..9150d782 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -8,7 +8,7 @@ qtci-windows-10-x86_64-7                                            MSVC2015
 qtci-windows-10-x86_64-7            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-7            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation
+qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
 qtci-linux-openSUSE-42.3-x86_64                                     GCC         DeveloperBuild NoPch
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
 qtci-linux-RHEL-7.2-x86_64                                          GCC         Packaging Release NoUseGoldLinker
diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1
index 2fca7b67..632859a0 100644
--- a/coin/provisioning/common/patch_qnx.ps1
+++ b/coin/provisioning/common/patch_qnx.ps1
@@ -44,7 +44,7 @@ $zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip"
 $sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565"
 $tempDir = "C:\temp\qnx_path"
 
-Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
 Verify-Checksum $zip $sha1
 Extract-Zip $zip $tempDir
 Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
index 19993ecc..ad5c90d3 100644
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
@@ -60,5 +60,5 @@ function InstallZipPackageFromURL {
 
 echo "Patching QNX"
 
-baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip"
+baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip"
 InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
index ad1bf18f..ff25f463 100644
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
@@ -1,5 +1,18 @@
 # provides: python development libraries
 # version: provided by default Linux distribution repository
 # needed to build pyside
-sudo subscription-manager refresh
 sudo yum install -y python-devel python-virtualenv
+
+# install the EPEL repository which provides python3
+wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+sudo rpm -Uvh epel-release-latest-7.noarch.rpm
+sudo rm -f epel-release-latest-7.noarch.rpm
+
+# install python3
+sudo yum install -y python34-devel
+
+# install pip3
+wget https://bootstrap.pypa.io/get-pip.py
+sudo python3 get-pip.py
+sudo rm -f get-pip.py
+sudo pip3 install virtualenv