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

Change-Id: I4cd60a86dc6538d94163702e9635a58157c599b6

25 files changed, 123 insertions, 179 deletions

diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index dbd911df..d2328871 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,10 +1,10 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8-x86_64-2                                             MSVC2013    DeveloperBuild Release BuildExamples
-qtci-windows-10-x86_64-7                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix
+qtci-windows-8-x86_64-2                                             MSVC2013    DeveloperBuild Release
+qtci-windows-10-x86_64-7                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
 qtci-windows-8-x86-2                                                MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-8-x86_64-2                                             MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-7-x86-2                                                Mingw53     Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-7-x86-2                                                Mingw53     DeveloperBuild Release OpenGLDynamic
 qtci-windows-10-x86_64-7                                x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-7                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-7            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
@@ -14,10 +14,10 @@ qtci-linux-Ubuntu-16.04-x86_64                                      GCC
 qtci-linux-openSUSE-42.1-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
-qtci-macos-10.12-x86_64-8                                           Clang       DebugAndRelease Release DisableTests
+qtci-macos-10.12-x86_64-8                                           Clang       DebugAndRelease Release
 qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch
-qtci-osx-10.10-x86_64                                               Clang       Packaging DebugAndRelease Release
-qtci-osx-10.10-x86_64                                               Clang       Release NoFramework
+qtci-osx-10.10-x86_64                                               Clang       Packaging DebugAndRelease Release DisableTests
+qtci-osx-10.10-x86_64                                               Clang       Release NoFramework DisableTests
 qtci-osx-10.10-x86_64               IOS_ANY             x86_64      Clang       Release DisableTests Static
 qtci-linux-RHEL-7.2-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-16.04-x86_64      Boot2Qt_Jethro      armv7       GCC         Release
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 45fc3fff..efcdd620 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -4,6 +4,7 @@ qtci-windows-10-x86_64-7    WinRT_10                        MSVC2015    Packagin
 qtci-windows-10-x86-6                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-7                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-7    WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-2                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-7    WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-7    WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-RHEL-7.2-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
@@ -14,8 +15,6 @@ qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packagin
 qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-RHEL-6.6-x86_64  QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-RHEL-7.2-x86_64  QNX_700             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-2        QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-2        QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-7    QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-7    QNX_700             x86         Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-osx-10.10-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1
index 6870f3a7..88e2a10c 100644
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/cmake.ps1
@@ -2,7 +2,7 @@
 
 $zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip"
 
-Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip
+Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.ci.local\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip
 Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
 
 Extract-Zip $zip C:
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1
index af7f79ff..1d624243 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -53,6 +53,32 @@ function Extract-Zip
     $destinationFolder.CopyHere($zipfile.Items(), 16)
 }
 
+function Extract-Dev-Folders-From-Zip
+{
+    Param (
+        [string]$package,
+        [string]$zipDir,
+        [string]$installPath
+    )
+
+    $shell = new-object -com shell.application
+
+    echo "Extracting contents of $package"
+    foreach ($subDir in "lib", "include", "bin", "share") {
+        $zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir)
+        if ($zip) {
+            Write-Host "Extracting $subDir from zip archive"
+        } else {
+            Write-Host "$subDir is missing from zip archive - skipping"
+            continue
+        }
+        $destDir = $installPath + "\" + $subdir
+        New-Item $destDir -type directory
+        $destinationFolder = $shell.Namespace($destDir)
+        $destinationFolder.CopyHere($zip.Items(), 16)
+    }
+}
+
 function BadParam
 {
     Param ([string]$Description)
@@ -67,7 +93,11 @@ function Download
         [string] $Destination = $(BadParam("a download target location"))
     )
     try {
-        Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
+        if ($CachedUrl.StartsWith("http")) {
+            Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
+        } else {
+            Copy-Item $CachedUrl $Destination
+        }
     } catch {
         Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
     }
diff --git a/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh b/coin/provisioning/common/msvc_2015_update3_patch.ps1
index e958ea87..6a02f6bd 100755..100644
--- a/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh
+++ b/coin/provisioning/common/msvc_2015_update3_patch.ps1
@@ -1,11 +1,9 @@
-#!/bin/bash
-
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the test suite of the Qt Toolkit.
+## This file is part of the provisioning scripts of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -32,7 +30,31 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# Install Cumulative Servicing Release Visual Studio 2015 update 3
+# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
+
+$version = "2015 update3 (KB3165756)"
+$package = "C:\Windows\Temp\vs14-kb3165756.exe"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
+$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
+$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
+$preparedPackage="\\ci-files01-hki.ci.local\provisioning\windows\vs14-kb3165756-update"
+
+if (Test-Path $preparedPackage) {
+    echo "Using prepared package"
+    pushd $preparedPackage
+    $commandLine = "$preparedPackage\vs14-kb3165756.exe"
+} else {
+    echo "Fetching patch for Visual Studio $version..."
+    Download $url_official $url_cache $package
+    Verify-Checksum $package $sha1
+    $commandLine = $package
+}
+echo "Installing patch for Visual Studio $version..."
+. $commandLine /norestart /passive
 
-# hack: it seems that opensuse patched their openssl in a way that
-# disables ssl 2 without allowing configure's compile detection to work
-echo "export OPENSSL_ALLOW_SSL2=1" >>~/.bashrc
+if ($commandLine.StartsWith("C:\Windows")) {
+    remove-item $package
+}
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1
index 3edbc412..ef4be200 100644
--- a/coin/provisioning/common/python.ps1
+++ b/coin/provisioning/common/python.ps1
@@ -43,12 +43,12 @@ $package = "C:\Windows\temp\python-$version.msi"
 if ( $archVer -eq 64 ) {
     echo "Running in 64 bit system"
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi"
+    $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.amd64.msi"
     $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
 }
 else {
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi"
+    $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.msi"
     $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0"
 }
 
diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/windows_removethemall.ps1
index ebbf15dd..0e584900 100644
--- a/coin/provisioning/common/01-windows_removethemall.ps1
+++ b/coin/provisioning/common/windows_removethemall.ps1
@@ -56,6 +56,6 @@ Function Remove-Path {
 }
 
 # Remove Android sdk and ndk
-Remove C:\utils\android*
+dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" }
 [Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
 [Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh
deleted file mode 100644
index ba8dbdd3..00000000
--- a/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh
deleted file mode 100644
index 44df94e7..00000000
--- a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-mkdir -p $HOME/Library/LaunchAgents
-cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>org.qt.io.screensaver_disable</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>defaults</string>
-            <string>-currentHost</string>
-            <string>write</string>
-            <string>com.apple.screensaver</string>
-            <string>idleTime</string>
-            <string>0</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-    </dict>
-</plist>
-EOT
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh
deleted file mode 100644
index ba8dbdd3..00000000
--- a/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh
deleted file mode 100644
index 44df94e7..00000000
--- a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-mkdir -p $HOME/Library/LaunchAgents
-cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>org.qt.io.screensaver_disable</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>defaults</string>
-            <string>-currentHost</string>
-            <string>write</string>
-            <string>com.apple.screensaver</string>
-            <string>idleTime</string>
-            <string>0</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-    </dict>
-</plist>
-EOT
diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
index f16b5ef4..37af7119 100644
--- a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
@@ -30,21 +30,5 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
 
-# Install Cumulative Servicing Release Visual Studio 2015 update 3
-# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
-# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe
-
-$version = "2015 update3 (KB3165756)"
-$package = "C:\Windows\Temp\vs14-kb3165756.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
-$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
-$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
-
-echo "Fetching patch for Visual Studio $version..."
-Download $url_official $url_cache $package
-Verify-Checksum $package $sha1
-echo "Installing patch for Visual Studio $version..."
-cmd /c "$package /norestart /Quiet"
-remove-item $package
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
index f16b5ef4..37af7119 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
@@ -30,21 +30,5 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
 
-# Install Cumulative Servicing Release Visual Studio 2015 update 3
-# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
-# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe
-
-$version = "2015 update3 (KB3165756)"
-$package = "C:\Windows\Temp\vs14-kb3165756.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
-$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
-$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
-
-echo "Fetching patch for Visual Studio $version..."
-Download $url_official $url_cache $package
-Verify-Checksum $package $sha1
-echo "Installing patch for Visual Studio $version..."
-cmd /c "$package /norestart /Quiet"
-remove-item $package
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
index 5e75f662..56b78f47 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
@@ -37,76 +37,52 @@
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
 $version = "5.6.11"
-$packagex64 = "C:\Windows\temp\mysql-$version-win64.zip"
+$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip"
 $packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
 
-function CheckAndRemovePreviousInstallation
-{
-    Param (
-        [string]$InstallFolder
-    )
-    echo "Check for previous installation..."
-    $FolderExists = Test-Path $ExistingInstallation
-    If ($FolderExists -eq $True) {
-        echo "Removing previous installation ($ExistingInstallation)"
-        Remove-Item $ExistingInstallation -recurse
-    }
-}
-
 function DownloadAndInstall
 {
     Param (
-        [string]$arch,
-        [string]$externalUrl,
         [string]$internalUrl,
         [string]$package,
-        [string]$sha1,
         [string]$installPath
     )
 
-   echo "Fetching from URL ..."
-   Download $externalUrl $internalUrl $package
-   Verify-Checksum $package $sha1
-   Extract-Zip $package $installPath
+    echo "Fetching from URL ..."
+    Copy-Item $internalUrl $package
+
+    $zipDir = [io.path]::GetFileNameWithoutExtension($package)
+    Extract-Dev-Folders-From-Zip $package $zipDir $installPath
+
+    Remove-Item $package
 }
 
+# Remove any leftovers
+try {
+    Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
+} catch {}
+
 # Install x64 bit version
 $architecture = "x64"
-$installFolder = "C:\Utils\my_sql"
-$existingInstallation = "$installFolder\my_sql"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-winx64"
-$sha1 = "f4811512b5f3c8ad877ee4feba2062312a0acc38"
+$installFolder = "C:\Utils\my_sql\my_sql"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-winx64.zip"
 
-echo "Check and remove previous installation ..."
-CheckAndRemovePreviousInstallation $existingInstallation
-DownloadAndInstall $architecture $internalUrl $internalUrl $packagex64 $sha1 $installFolder
-Rename-Item -path $installFolder\mysql-$version-winx64 -newName $installFolder\my_sql
-
-echo "Remove downloaded package ..."
-Remove-Item $packagex64
+DownloadAndInstall $internalUrl $packagex64 $installFolder
 
 echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
 
 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\Utils\my_sql$architecture"
-$existingInstallation = "$installFolder\my_sql"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-win32"
-$sha1 = "e0aa62d5c5d6c6ec28906a831752d04336562679"
-
-echo "Check and remove previous installation ..."
-CheckAndRemovePreviousInstallation $existingInstallation
-DownloadAndInstall $architecture $internalUrl $internalUrl $packagex86 $sha1 $installFolder
-Rename-Item -path $installFolder\mysql-$version-win32 -newName $installFolder\my_sql
+$installFolder = "C:\Utils\my_sql\my_sql$architecture"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-win32.zip"
 
-echo "Remove downloaded package ..."
-Remove-Item $packagex86
+DownloadAndInstall $internalUrl $packagex86 $installFolder
 
 echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine")
 
 # Store version information to ~/versions.txt, which is used to print version information to provision log.
 echo "MySQL = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
index 079f26c3..fa2c753a 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
@@ -40,7 +40,7 @@ $openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
 
 $mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
 $mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
-$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll"
+$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll"
 $openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
 
 Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package
diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
index 35340ca7..cd0115d2 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
@@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 $architecture = "x64"
 $installFolder = "C:\openssl"
 $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
-$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win64OpenSSL-$version.exe"
 $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
 
 echo "Fetching from URL ..."
@@ -65,7 +65,7 @@ echo "Set $architecture environment variables ..."
 $architecture = "x86"
 $installFolder = "C:\openssl$architecture"
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
-$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win32OpenSSL-$version.exe"
 $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
 
 echo "Fetching from URL ..."
diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
index 9b1d5d4e..b73c3778 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
@@ -42,43 +42,48 @@ $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
 
 # Install x64 bit versions
 $architecture = "x64"
-$installFolder = "C:\Utils\postgresql"
+$installFolder = "C:\Utils\postgresql\pgsql"
 $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-x64-binaries.zip"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
 $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
 
+# Delete any leftovers
+try {
+    Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
+} catch {}
+
 echo "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex64
 Verify-Checksum $packagex64 $sha1
 echo "Installing $packagex64 ..."
-Extract-Zip $packagex64 $installFolder
+Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
 
 echo "Remove downloaded $packagex64 ..."
 Remove-Item $packagex64
 
 echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine")
 
 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\Utils\postgresql$architecture"
+$installFolder = "C:\Utils\postgresql$architecture\pgsql"
 $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-binaries.zip"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-binaries.zip"
 $sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
 
 echo "Fetching from URL..."
 Download $externalUrl $internalUrl $packagex86
 Verify-Checksum $packagex86 $sha1
 echo "Installing $packagex86 ..."
-Extract-Zip $packagex86 $installFolder
+Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder
 
 echo "Remove downloaded $packagex86 ..."
 Remove-Item $packagex86
 
 echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine")
 
 # Store version information to ~/versions.txt, which is used to print version information to provision log.
 echo "PostgreSQL = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
index b75fd2a6..fdb70ef8 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
@@ -3,7 +3,7 @@
 # This script will install msys which is needed for configuring openssl for Android
 
 $version = "1.0.11"
-$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z"
+$url = "\\ci-files01-hki.ci.local\provisioning\windows\msys-$version.7z"
 
 $zip = "c:\users\qt\downloads\msys-$version.7z"
 $sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
index ca641d25..23d98847 100644
--- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
@@ -8,7 +8,7 @@
 
 # NDK
 $ndkVersion = "r10e"
-$ndkCachedUrl = "http://ci-files01-hki.ci.local/input/android/android-ndk-$ndkVersion-windows-x86.zip"
+$ndkCachedUrl = "\\ci-files01-hki.ci.local\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
 $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
 $ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357"
 $ndkFolder = "c:\utils\android-ndk-$ndkVersion"
@@ -19,7 +19,7 @@ $sdkVersion = "r24.4.1"
 $sdkApi = "ANDROID_API_VERSION"
 $sdkApiLevel = "android-21"
 $sdkBuildToolsVersion = "23.0.3"
-$sdkCachedUrl= "http://ci-files01-hki.ci.local/input/android/android-sdk_$sdkVersion-windows.zip"
+$sdkCachedUrl= "\\ci-files01-hki.ci.local\provisioning\android\android-sdk_$sdkVersion-windows.zip"
 $sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip"
 $sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49"
 $sdkFolder = "c:\utils\android-sdk-windows"
diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
index a1b656c6..14a5a085 100644
--- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
@@ -9,7 +9,7 @@ $zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
 $sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
 $destination = "C:\Utils\openssl-android-master"
 
-Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip
+Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.ci.local\provisioning\openssl\openssl-$version.tar.gz $zip
 Verify-Checksum $zip $sha1
 
 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils
diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"