Update submodules on '5.11.2' in qt5

Change-Id: Iffc768a304dedfd645219db18ce10fb77515710f Reviewed-by: Liang Qi <liang.qi@qt.io>
2025-12-22 07:56:15 +08:00 · 2018-09-13 15:33:30 +00:00 · 2018-09-12 19:49:09 +00:00
187 changed files with 647 additions and 2063 deletions
--- a/.commit-template
+++ b/.commit-template
@@ -9,11 +9,7 @@

 # ==[ Footers: Uncomment and edit where applicable ]===================|
 #
-# One task per entry. Add a space after the colon.
-# Use Fixes to automatically close an issue, and Task-number to
-# reference it without further action.
-# You do not need both for the same issue.
-#Fixes:
+# One task per entry. Remember space after colon.
 #Task-number: 
 #Coverity-Id: 
 #
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,68 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
-	recommends = qtsvg
+	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
-	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
-	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
+	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -123,185 +121,191 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.12.0
-	status = addon
+	branch = 5.11.2
+	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
+[submodule "qtenginio"]
+	depends = qtdeclarative
+	path = qtenginio
+	url = ../qtenginio.git
+	branch = dev
+	status = ignore
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtwebengine"]
-	depends = qtdeclarative
-	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
+	depends = qtquickcontrols qtwebchannel
+	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.12.0
-	status = essential
+	branch = 5.11.2
+	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.12.0
+	branch = 5.11.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.12.0
-	status = addon
+	branch = 5.11.2
+	status = preview
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.12.0
-	status = addon
+	branch = 5.11.2
+	status = preview
--- a/LGPL_EXCEPTION.txt
+++ b/LGPL_EXCEPTION.txt
@@ -0,0 +1,22 @@
+The Qt Company Qt LGPL Exception version 1.1
+
+As an additional permission to the GNU Lesser General Public License version
+2.1, the object code form of a "work that uses the Library" may incorporate
+material from a header file that is part of the Library.  You may distribute
+such object code under terms of your choice, provided that:
+    (i)   the header files of the Library have not been modified; and 
+    (ii)  the incorporated material is limited to numerical parameters, data
+          structure layouts, accessors, macros, inline functions and
+          templates; and
+    (iii) you comply with the terms of Section 6 of the GNU Lesser General
+          Public License version 2.1.
+
+Moreover, you may apply this exception to a modified version of the Library,
+provided that such modification does not involve copying material from the
+Library into the modified Library's header files unless such material is
+limited to (i) numerical parameters; (ii) data structure layouts;
+(iii) accessors; and (iv) small macros, templates and inline functions of
+five lines or less in length.
+
+Furthermore, you are not required to apply this additional permission to a
+modified version of the Library.
--- a/4
+++ b/4
@@ -49,8 +49,8 @@ BraceWrapping:

 # When constructor initializers do not fit on one line, put them each on a new line.
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
-# Indent initializers by 4 spaces
-ConstructorInitializerIndentWidth: 4
+# Indent initializers by 8 spaces
+ConstructorInitializerIndentWidth: 8

 # Indent width for line continuations.
 ContinuationIndentWidth: 8
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,27 +1,27 @@
-Template                            Target OS           Target arch Compiler    Target Compiler Features
----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10                                           MSVC2015                    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
-qtci-windows-7-x86-3                                                Mingw73                     DeveloperBuild Release OpenGLDynamic
-qtci-windows-10-x86_64-10                               x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10                                           MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10           WinRT_10            x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10           WinRT_10            armv7       MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                                           MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC                         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples
-qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
-qtci-linux-openSUSE-42.3-x86_64                                     GCC                         DeveloperBuild NoPch
-qtci-linux-openSUSE-42.3-x86_64                                     ICC_18                      DeveloperBuild NoPch DisableTests SystemSQLite
-qtci-linux-RHEL-7.4-x86_64                                          GCC                         Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
-qtci-macos-10.13-x86_64-2                                           Clang                       Packaging DebugAndRelease Release
-qtci-macos-10.12-x86_64-8                                           Clang                       DeveloperBuild NoFramework Release QtNamespace NoPch
-qtci-macos-10.13-x86_64-2           IOS_ANY             multi       Clang                       Packaging DebugAndRelease DisableTests Static
-qtci-macos-10.13-x86_64-2           TvOS_ANY            multi       Clang                       DebugAndRelease DisableTests
-qtci-macos-10.13-x86_64-2           WatchOS_ANY         multi       Clang                       DebugAndRelease DisableTests
-qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64          Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-18.04-x86_64      QEMU                armv7       GCC                         Release
-qtci-linux-Ubuntu-18.04-x86_64      QEMU                arm64       GCC                         Release
-qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         TestOnly LicenseCheck
-qtci-linux-RHEL-7.4-x86_64          INTEGRITY_11_04     armv7       GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64          QNX_700             armv7       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+Template                            Target OS           Target arch Compiler    Features
+----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10                                           MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
+qtci-windows-7-x86-3                                                Mingw53     DeveloperBuild Release OpenGLDynamic
+qtci-windows-10-x86_64-10                               x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                                           MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10           WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10           WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10                                           MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
+qtci-linux-openSUSE-42.3-x86_64                                     GCC         DeveloperBuild NoPch
+qtci-linux-openSUSE-42.3-x86_64                                     ICC_18      DeveloperBuild NoPch DisableTests SystemSQLite
+qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
+qtci-linux-RHEL-7.4-x86_64                                          GCC         Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
+qtci-macos-10.12-x86_64-8                                           Clang       Packaging DebugAndRelease Release
+qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch
+qtci-osx-10.11-x86_64-3                                             Clang       Release NoFramework DisableTests
+qtci-macos-10.12-x86_64-8           IOS_ANY             multi       Clang       Release DisableTests Static
+qtci-macos-10.12-x86_64-8           TvOS_ANY            multi       Clang       Release DisableTests
+qtci-macos-10.12-x86_64-8           WatchOS_ANY         multi       Clang       Release DisableTests
+qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                armv7       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                arm64       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         TestOnly LicenseCheck
+qtci-linux-RHEL-7.4-x86_64          INTEGRITY_11_04     armv7       GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64          QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -1,22 +1,19 @@
-Template                    Target OS           Target arch Compiler    Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-3        Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3        Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+Template                    Target OS           Target arch Compiler    Features
+--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                                   Mingw73     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
+qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,22 +1,23 @@
-Template                    Target OS           Target arch Compiler    Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-3        Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3        Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+Template                    Target OS           Target arch Compiler    Features
+--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                                   Mingw73     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8   QNX_700             x86         GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
+qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
+qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
+qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
--- a/coin/platform_configs/qtbase.txt
+++ b/coin/platform_configs/qtbase.txt
@@ -1,7 +1,4 @@
 Template                          Target OS           Target arch Compiler    Features
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                armv7       GCC         DeveloperBuild DisableTests
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                arm64       GCC         DeveloperBuild DisableTests
-qtci-windows-10-x86_64-10         WinRT_10            x86_64      MSVC2015    DeveloperBuild Static Release ForceDebugInfo
-qtci-linux-openSUSE-42.3-x86_64   WebAssembly                     GCC         DeveloperBuild NoPch DisableTests
-
+qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                armv7       GCC         DeveloperBuild DisableTests
+qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                arm64       GCC         DeveloperBuild DisableTests
--- a/coin/platform_configs/qtdeclarative.txt
+++ b/coin/platform_configs/qtdeclarative.txt
@@ -1,4 +1,4 @@
 Template                          Target OS           Target arch Compiler    Features
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                armv7       GCC         DeveloperBuild
-qtci-linux-Ubuntu-18.04-x86_64    QEMU                arm64       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                arm64       GCC         DeveloperBuild
--- a/coin/platform_configs/qtwebkit.txt
+++ b/coin/platform_configs/qtwebkit.txt
@@ -1,4 +1,4 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-7-x86-3                                        Mingw73     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -49,15 +49,15 @@ sdkTargetFolder="$targetFolder/sdk"

 basePath="http://ci-files01-hki.intra.qt.io/input/android"

-toolsVersion="r26.1.1"
-toolsFile="sdk-tools-linux-4333796.zip"
-ndkVersion="r18b"
+toolsVersion="r25.2.5"
+toolsFile="tools_$toolsVersion-linux.zip"
+ndkVersion="r10e"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
-sdkBuildToolsVersion="28.0.3"
+sdkBuildToolsVersion="25.0.2"
 sdkApiLevel="android-21"

-toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
-ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b"
+toolsSha1="72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"
+ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -74,7 +74,7 @@ rm "$ndkTargetFile"
 rm "$toolsTargetFile"

 echo "Changing ownership of Android files."
-if uname -a |grep -q "el7"; then
+if uname -a |grep -q "el6\|el7"; then
    sudo chown -R qt:wheel "$targetFolder"
 else
    sudo chown -R qt:users "$targetFolder"
@@ -90,9 +90,6 @@ else
    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
 fi

-echo "Checking the contents of Android SDK..."
-ls -l "$sdkTargetFolder"
-
 SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
 SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
 SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
@@ -105,12 +102,7 @@ echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
 echo "Android NDK = $ndkVersion" >> ~/versions.txt

 cd "$sdkTargetFolder/tools/bin"
-./sdkmanager --install "emulator"
 echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"
-
-echo "Checking the contents of Android SDK again..."
-ls -l "$sdkTargetFolder"
-
 echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f
 # Purely informative, show the list of avd devices
 ./avdmanager list avd
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2016 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/common/linux/docker.sh
+++ b/coin/provisioning/common/linux/docker.sh
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-# Download and install the docker engine.
-sudo apt-get install curl -y
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-sudo apt-get update
-sudo apt-get install docker-ce -y
-sudo usermod -a -G docker $USER
-sudo docker info
-
-# Download and install the docker-compose extension.
-sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
-sudo chmod +x /usr/local/bin/docker-compose
-
-# Start testserver provisioning
-source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh"
--- a/coin/provisioning/common/linux/emsdk.sh
+++ b/coin/provisioning/common/linux/emsdk.sh
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-#############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-
-version="1.38.1"
-version_node="8.9.1"
-urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
-urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
-urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-llvm-e$version.tar.gz"
-urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
-urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
-urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
-sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3"
-sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7"
-sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
-targetFolder="/opt/emsdk"
-sudo mkdir "$targetFolder"
-
-InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
-InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" ""
-InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" ""
-
-sudo chmod -R a+rwx "$targetFolder"
-
-echo "Writing $targetFolder/.emscripten"
-cat <<EOM >"$targetFolder/.emscripten"
-LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/'
-EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer'
-BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen'
-NODE_JS='$targetFolder/node-v$version_node-linux-x64/bin/node'
-EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
-SPIDERMONKEY_ENGINE = ''
-V8_ENGINE = ''
-TEMP_DIR = '/tmp'
-COMPILER_ENGINE = NODE_JS
-JS_ENGINES = [NODE_JS]
-EOM
-
-SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\""
-SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
-SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
--- a/coin/provisioning/common/linux/gcc.sh
+++ b/coin/provisioning/common/linux/gcc.sh
@@ -1,102 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script builds GCC from sources
-
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-
-set -ex
-
-function InstallGCC() {
-    version=$1
-    priority=$2
-    prebuiltSHA1=$3
-    sourcesSHA1=$4
-
-    tmpFolder="/tmp"
-
-    prebuiltGCC="http://ci-files01-hki.intra.qt.io/input/gcc/gcc-$version-prebuilt.tar.gz"
-    prebuiltTarget="$tmpFolder/gcc-$version-prebuilt.tar.gz"
-    installPrefix="/usr/local"
-
-    suffixVersion=$(echo "$version" | cut -d "." -f1,2)
-    sourceFile="gcc-$version.tar.xz"
-    cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile"
-    officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile"
-
-    targetFile="$tmpFolder/$sourceFile"
-    buildFolder="$HOME/gcc_build"
-
-    echo "Fetching prebuilt GCC."
-    curl --fail -L --retry 5 --retry-delay 5 -o "$prebuiltTarget" "$prebuiltGCC" || (
-        echo "Fetching prebuilt GCC failed. Building from sources."
-        DownloadURL "$cachedUrl" "$officialUrl" "$sourcesSHA1" "$targetFile"
-    )
-
-    if [ -f "$prebuiltTarget" ]; then
-        echo "$prebuiltSHA1 *$prebuiltTarget" | sha1sum -c -
-        sudo tar -xzf "$prebuiltTarget" -C "$installPrefix"
-        rm -rf "$prebuiltTarget"
-    else
-        tar -C "$tmpFolder" -xJf "$targetFile"
-        mkdir -p "$buildFolder"
-        cd "$tmpFolder/gcc-$version"
-        sudo "$tmpFolder/gcc-$version/contrib/download_prerequisites"
-        cd "$buildFolder"
-        "$tmpFolder/gcc-$version/configure" --disable-bootstrap --enable-languages=c,c++,lto --prefix="$installPrefix" --program-suffix="-$suffixVersion"
-        make -j4
-        sudo make install
-
-        rm -rf "$targetFile"
-        rm -rf "$tmpFolder/gcc-$version"
-    fi
-
-    # openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
-    if [ -f "/usr/sbin/update-alternatives" ]; then
-        sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \
-                                           --slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
-                                           --slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
-                                           --slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
-    else
-        sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
-        sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
-        sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
-        sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
-    fi
-
-
-    echo "GCC = $version" >> ~/versions.txt
-}
--- a/coin/provisioning/common/linux/open62541.sh
+++ b/coin/provisioning/common/linux/open62541.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -59,15 +59,15 @@ sudo pip install six

 git clone https://github.com/open62541/open62541.git open62541
 cd open62541
-git checkout 215651ab8db94e5eacdd10ec26a5a9fb96b9301f
+git checkout 8845e493d7751fd4eee3917b540e5346646b9cf7
 mkdir build
 cd build
-TARGETPATH=/opt/open62541
-cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH="$TARGETPATH" ..
+cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib/open62541 ..
 make

 sudo make install
 sudo /sbin/ldconfig

-SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH"
+SetEnvVar "QTOPCUA_OPEN62541_LIB_PATH" "/usr/local/lib/open62541"
+SetEnvVar "QTOPCUA_OPEN62541_INCLUDE_PATH" "/usr/local/include/open62541"

--- a/coin/provisioning/common/linux/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh
@@ -41,12 +41,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="1.0.2p"
+version="1.0.2o"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
 installFolder="/home/qt/"
-sha="f34b5322e92415755c7d58bf5d0d5cf37666382c"
+sha="a47faaca57b47a0d9d5fb085545857cc92062691"
 # Until every VM doing Linux Android builds have provisioned the env variable
 # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
 # QTQAINFRA-1436
@@ -56,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"

 tar -xzf "$targetFile" -C "$installFolder"
 # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
-mv "${opensslHome}p" "${opensslHome}"
+mv "${opensslHome}o" "${opensslHome}"
 pushd "$opensslHome"

 echo "Running configure"
--- a/coin/provisioning/common/linux/testserver/apache2/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/apache2/Dockerfile
@@ -1,6 +0,0 @@
-FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y apache2 libcgi-session-perl wget avahi-daemon
-EXPOSE 80 443
-
-# install configurations and test data
-RUN wget https://tools.ietf.org/rfc/rfc3252.txt
--- a/coin/provisioning/common/linux/testserver/danted/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/danted/Dockerfile
@@ -1,9 +0,0 @@
-FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y gdebi-core=0.9.5.7ubuntu1 wget avahi-daemon
-RUN wget http://ppa.launchpad.net/dajhorn/dante/ubuntu/pool/main/d/dante/dante-server_1.4.1-1_amd64.deb
-RUN gdebi -n dante-server_1.4.1-1_amd64.deb
-EXPOSE 1080-1081
-
-# install configurations and test data
-COPY danted /etc/init.d/
-COPY danted-authenticating /etc/init.d/
--- a/coin/provisioning/common/linux/testserver/danted/danted
+++ b/coin/provisioning/common/linux/testserver/danted/danted
@@ -1,93 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          danted
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: SOCKS (v4 and v5) proxy daemon (danted)
-### END INIT INFO
-#
-# dante SOCKS server init.d file. Based on /etc/init.d/skeleton:
-# Version:    @(#)skeleton  1.8  03-Mar-1998  miquels@cistron.nl
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/danted
-NAME=danted
-DESC="Dante SOCKS daemon"
-PIDFILE=/var/run/$NAME.pid
-CONFFILE=/etc/$NAME.conf
-
-test -f $DAEMON || exit 0
-
-set -e
-
-# This function makes sure that the Dante server can write to the pid-file.
-touch_pidfile ()
-{
-    if [ -r $CONFFILE ]; then
-        uid="`sed -n -e 's/[[:space:]]//g' -e 's/#.*//' -e '/^user\.privileged/{s/[^:]*://p;q;}' \
-            $CONFFILE`"
-        if [ -n "$uid" ]; then
-            touch $PIDFILE
-            chown $uid $PIDFILE
-        fi
-    fi
-}
-
-. /lib/lsb/init-functions
-
-case "$1" in
-    start)
-        if ! egrep -cve '^ *(#|$)' \
-            -e '^(logoutput|user\.((not)?privileged|libwrap)):' $CONFFILE > /dev/null
-        then
-            echo "Not starting $DESC: not configured."
-            exit 0
-        fi
-        echo -n "Starting $DESC: "
-        touch_pidfile
-        start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON -- -D
-        echo "$NAME."
-        ;;
-    stop)
-        echo -n "Stopping $DESC: "
-        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
-        echo "$NAME."
-        ;;
-    reload|force-reload)
-        #
-        # If the daemon can reload its config files on the fly
-        # for example by sending it SIGHUP, do it here.
-        #
-        # If the daemon responds to changes in its config file
-        # directly anyway, make this a do-nothing entry.
-        #
-        echo "Reloading $DESC configuration files."
-        start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --exec $DAEMON -- -D
-        ;;
-    restart)
-        #
-        # If the "reload" option is implemented, move the "force-reload"
-        # option to the "reload" entry above. If not, "force-reload" is
-        # just the same as "restart".
-        #
-        echo -n "Restarting $DESC: "
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
-        sleep 1
-        touch_pidfile
-        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -D
-        echo "$NAME."
-        ;;
-    status)
-        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-        ;;
-    *)
-        N=/etc/init.d/$NAME
-        # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-        echo "Usage: $N {start|stop|restart|force-reload}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
--- a/coin/provisioning/common/linux/testserver/danted/danted-authenticating
+++ b/coin/provisioning/common/linux/testserver/danted/danted-authenticating
@@ -1,97 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          danted-authenticating
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: SOCKS (v4 and v5) proxy daemon (danted)
-### END INIT INFO
-#
-# dante SOCKS server init.d file. Based on /etc/init.d/skeleton:
-# Version:    @(#)skeleton  1.8  03-Mar-1998  miquels@cistron.nl
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/danted
-NAME=danted-authenticating
-DESC="Dante SOCKS daemon"
-PIDFILE=/var/run/$NAME.pid
-CONFFILE=/etc/$NAME.conf
-DANTED_ARGS="-D -f $CONFFILE"
-
-test -f $DAEMON || exit 0
-
-set -e
-
-# This function makes sure that the Dante server can write to the pid-file.
-touch_pidfile ()
-{
-    if [ -r $CONFFILE ]; then
-        uid="`sed -n -e 's/[[:space:]]//g' -e 's/#.*//' -e '/^user\.privileged/{s/[^:]*://p;q;}' \
-            $CONFFILE`"
-        if [ -n "$uid" ]; then
-            touch $PIDFILE
-            chown $uid $PIDFILE
-        fi
-    fi
-}
-
-. /lib/lsb/init-functions
-
-case "$1" in
-    start)
-        if ! egrep -cve '^ *(#|$)' \
-            -e '^(logoutput|user\.((not)?privileged|libwrap)):' $CONFFILE > /dev/null
-        then
-            echo "Not starting $DESC: not configured."
-            exit 0
-        fi
-        echo -n "Starting $DESC: "
-        touch_pidfile
-        start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE \
-            --exec $DAEMON -- $DANTED_ARGS
-        echo "$NAME."
-        ;;
-    stop)
-        echo -n "Stopping $DESC: "
-        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
-        echo "$NAME."
-        ;;
-    reload|force-reload)
-        #
-        # If the daemon can reload its config files on the fly
-        # for example by sending it SIGHUP, do it here.
-        #
-        # If the daemon responds to changes in its config file
-        # directly anyway, make this a do-nothing entry.
-        #
-        echo "Reloading $DESC configuration files."
-        start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
-            --exec $DAEMON -- $DANTED_ARGS
-        ;;
-    restart)
-        #
-        # If the "reload" option is implemented, move the "force-reload"
-        # option to the "reload" entry above. If not, "force-reload" is
-        # just the same as "restart".
-        #
-        echo -n "Restarting $DESC: "
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
-        sleep 1
-        touch_pidfile
-        start-stop-daemon --start --quiet --pidfile $PIDFILE \
-            --exec $DAEMON -- $DANTED_ARGS
-        echo "$NAME."
-        ;;
-    status)
-        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-        ;;
-    *)
-        N=/etc/init.d/$NAME
-        # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-        echo "Usage: $N {start|stop|restart|force-reload}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
--- a/coin/provisioning/common/linux/testserver/docker_testserver.sh
+++ b/coin/provisioning/common/linux/testserver/docker_testserver.sh
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-# Using SHA-1 of each server context as the tag of docker images. A tag labels a
-# specific image version. It is used by docker compose file (docker-compose.yml)
-# to launch the corresponding docker containers. If one of the server contexts
-# (./apache2, ./danted, ...) gets changes, all the related compose files in
-# qtbase should be updated as well.
-#
-# For example, here's how to get the SHA-1 of apache test server.
-# find ./apache2 -type f -print0 | sort -z | xargs -r0 sha1sum | \
-# awk '{ print $1 }' | sha1sum | awk '{ print $1 }'
-
-testserver='apache2 squid vsftpd ftp-proxy danted'
-
-for server in $testserver
-do
-    context="${BASH_SOURCE%/*}/$server"
-    sha1=$(find $context -type f -print0 | sort -z | xargs -r0 sha1sum | awk '{ print $1 }' | \
-           sha1sum | awk '{ print $1 }')
-    sudo docker build -t qt-test-server-$server:$sha1 $context
-done
-
-sudo docker images
--- a/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile
@@ -1,3 +0,0 @@
-FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y ftp-proxy=1.9.2.4-10 avahi-daemon
-EXPOSE 2121
--- a/coin/provisioning/common/linux/testserver/squid/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/squid/Dockerfile
@@ -1,3 +0,0 @@
-FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y squid=3.5.12-1ubuntu7.5 avahi-daemon
-EXPOSE 3128-3130
--- a/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile
@@ -1,6 +0,0 @@
-FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y vsftpd=3.0.3-3ubuntu2 ftp=0.17-33 wget avahi-daemon
-EXPOSE 20-21
-
-# install configurations and test data
-RUN wget https://tools.ietf.org/rfc/rfc3252.txt
--- a/coin/provisioning/common/linux/version.sh
+++ b/coin/provisioning/common/linux/version.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2016 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/common/macos/cmake.sh
+++ b/coin/provisioning/common/macos/cmake.sh
@@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.11.3-Darwin-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.11/cmake-3.11.3-Darwin-x86_64.tar.gz"
-SHA1="3d13de8020ce560159fa5cecb669498c48552d96"
-appPrefix="cmake-3.11.3-Darwin-x86_64"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz"
+AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz"
+SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e"
+appPrefix="cmake-3.6.2-Darwin-x86_64"

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

 SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH"

-echo "CMake = 3.11.3" >> ~/versions.txt
+echo "CMake = 3.6.2" >> ~/versions.txt
--- a/coin/provisioning/common/macos/fbx_macos.sh
+++ b/coin/provisioning/common/macos/fbx_macos.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -39,21 +39,33 @@ set -ex
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="2016.1.2"
-fileName="fbx20161_2_fbxsdk_clang_mac.pkg_nospace.tgz"
+fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
+targetFolder="/opt/fbx"
 cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName"
-# officialUrl="http://download.autodesk.com/us/fbx_release_older/$version/fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
+officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName"
+sha1="f82535423c700c605320c52e13e781c92208ec6b"
 targetFolder="/tmp"
+targetFile="$targetFolder/$fileName"
+installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"

 echo "Extracting '$cachedUrl'"
-tar -xzf "$cachedUrl" -C "$targetFolder"
+tar -xzf "$cachedUrl" -C "$targetFolder" || (
+    echo "Failed to uncompress from '$cachedUrl'"
+    echo "Downloading from '$officialUrl'"
+    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl"
+    echo "Checking SHA1 on PKG '$targetFile'"
+    echo "$sha1 *$targetFile" > $targetFile.sha1
+    shasum --check $targetFile.sha1
+    echo "Extracting '$targetFile'"
+    tar -xzf "$targetFile" -C "$targetFolder"
+)

-rm -rf "$targetFolder/$fileName"
-echo "Copying preinstalled FBX SDK to Applications"
-sudo cp -r "$targetFolder/Autodesk" /Applications
+rm -rf "$targetFile"
+echo "Running installer for '$installer'"
+sudo installer -pkg "$installer" -target "/"

 # Set env variables
-SetEnvVar "FBXSDK" "/Applications/Autodesk/FBXSDK/2016.1.2/"
+SetEnvVar "FBXSDK" "/Applications/Autodesk/FBX\ SDK/2016.1.2/"

 echo "FBX SDK = 2016.1.2" >> ~/versions.txt

--- a/coin/provisioning/common/macos/install-commandlinetools.sh
+++ b/coin/provisioning/common/macos/install-commandlinetools.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/common/macos/install_xcode.sh
+++ b/coin/provisioning/common/macos/install_xcode.sh
@@ -49,27 +49,11 @@ function InstallXCode() {
    version=$2

    echo "Uncompressing and installing '$sourceFile'"
-    if [[ $sourceFile =~ tar ]]; then
-        cd /Applications/ && sudo tar -zxf "$sourceFile"
-    else
-        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
-    fi
-
-    echo "Versioning application bundle"
-    majorVersion=$(echo $version | cut -d '.' -f 1)
-    versionedAppBundle="/Applications/Xcode${majorVersion}.app"
-    sudo mv /Applications/Xcode.app ${versionedAppBundle}
-
-    echo "Selecting Xcode"
-    sudo xcode-select --switch ${versionedAppBundle}
+    xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)

    echo "Accept license"
    sudo xcodebuild -license accept

-    echo "Install packages"
-    # -runFirstLaunch is valid in 9.x
-    sudo xcodebuild -runFirstLaunch || true
-
    echo "Enabling developer mode, so that using lldb does not require interactive password entry"
    sudo /usr/sbin/DevToolsSecurity -enable

--- a/coin/provisioning/common/macos/python3.sh
+++ b/coin/provisioning/common/macos/python3.sh
@@ -52,14 +52,10 @@ InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"

 InstallPip python3.6

-/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv wheel
+/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv

 SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
 SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"

-# Install all needed packages in a special wheel cache directory
-/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
 echo "python3 = 3.6.1" >> ~/versions.txt

--- a/coin/provisioning/common/shared/requirements.txt
+++ b/coin/provisioning/common/shared/requirements.txt
@@ -1,19 +0,0 @@
-# This file holds all python3 packages need for a certain qt module
-# When adding new packages here, first add a comment with the name of the module
-# Then all the packages. Duplicates are wanted as every module should install
-# all packages it needs and shouldn't depend on a package from another module
-#
-# qtivi
-antlr4-python3-runtime==4.7.1
-argh==0.26.2
-click==6.7
-coloredlogs==10.0
-humanfriendly==4.15.1
-Jinja2==2.10
-MarkupSafe==1.0
-path.py==11.0.1
-pathtools==0.1.2
-PyYAML==3.13
-six==1.11.0
-typing==3.6.4
-watchdog==0.8.3
--- a/coin/provisioning/common/unix/DownloadURL.sh
+++ b/coin/provisioning/common/unix/DownloadURL.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
@@ -2,10 +2,10 @@

 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -64,9 +64,6 @@ function InstallFromCompressedFileFromURL {
        "zip")
            unzip "$targetFile" -d "$targetDirectory"
        ;;
-        "xz")
-            tar -xf "$targetFile" --directory "$targetDirectory"
-        ;;
        *)
            exit 1
        ;;
--- a/coin/provisioning/common/unix/SetEnvVar.sh
+++ b/coin/provisioning/common/unix/SetEnvVar.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/common/unix/check_and_set_proxy.sh
+++ b/coin/provisioning/common/unix/check_and_set_proxy.sh
@@ -4,7 +4,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -48,12 +48,18 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

 libclang_version=6.0
+libclang_version_Rhel6=4.0

 if uname -a |grep -q Darwin; then
    version=$libclang_version
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-mac.7z"
    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z"
    sha1="0af8ab8c1174faf4b721d079587190fc32ea8364"
+elif uname -a |grep -q "el6"; then
+    version=$libclang_version_Rhel6
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
+    sha1="c7466109628418a6aa3db8b3f5825f847f1c4952"
 else
    version=$libclang_version
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
@@ -73,6 +79,8 @@ sudo mv /tmp/libclang "$destination"
 echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
 echo "libClang = $version" >> ~/versions.txt

-# This is a hacked static build of libclang which requires special
-# handling on the qdoc side.
-SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1"
+if [ "$version" == "6.0" ]; then
+    # This is a hacked static build of libclang which requires special
+    # handling on the qdoc side.
+    SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1"
+fi
--- a/coin/provisioning/common/unix/mqtt_broker.sh
+++ b/coin/provisioning/common/unix/mqtt_broker.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -39,10 +39,10 @@
 source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e"
+CommitSHA="5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
 PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
 AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-SHA1="a0ac88715c2aebb9573a113dc13925a90da19233"
+SHA1="6afc375c2702eb36a960f38dd4912a3422d679fd"
 targetFolder="/opt/paho_broker"
 appPrefix="paho.mqtt.testing-$CommitSHA"

--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -38,9 +38,9 @@ set -ex
 # This script will install squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)

-version="6.3.2"
+version="6.3.0"
 # Branch version without dot
-qtBranch="510x"
+qtBranch="59x"
 squishFolder="/opt/squish"
 squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
 squishFile="squish-$version-qt$qtBranch-linux64.run"
@@ -76,7 +76,7 @@ function MountAndInstall {
        usersGroup="staff"
        mountFolder="/Volumes"
        squishLicenseDir="/Users/qt"
-    elif uname -a |grep -q "el7"; then
+    elif uname -a |grep -q "el6\|el7"; then
        usersGroup="qt"
        mountFolder="/tmp"
        squishLicenseDir="/root"
@@ -129,7 +129,6 @@ function MountAndInstall {
        echo "'run-file', no need to uncompress"
        sudo cp $targetFileMount $targetDirectory
        UnMount
-        sudo chmod +x $targetDirectory/$targetFile
        sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
        sudo rm -fr "$targetDirectory/$targetFile"
        if uname -a |grep -q "Ubuntu"; then
@@ -161,7 +160,7 @@ MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile"
 echo "Installing squish $version.."
 MountAndInstall "$squishUrl" "$squishFolder" "$squishFile"

-echo "Installing provisioning scripts for squish"
+echo "Installing test suite for squish"
 MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz"

 echo "Verifying Squish Installation"
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -39,9 +39,9 @@
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html

-$version = "1.0.2p"
+$version = "1.0.2o"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
+$sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691"
 $destination = "C:\Utils\openssl-android-master"

 Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
@@ -53,9 +53,9 @@ Rename-Item C:\Utils\openssl-$version $destination
 Remove-Item -Path $zip
 Remove-Item C:\Utils\openssl-$version.tar

-Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang"
-Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar"
-Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr"
+Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
+Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
+Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"

 # Make sure configure for openssl has a "make" and "perl" available
 $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
--- a/coin/provisioning/common/windows/android.ps1
+++ b/coin/provisioning/common/windows/android.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -40,24 +40,23 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.

 # NDK
-$ndkVersion = "r18b"
+$ndkVersion = "r10e"
 $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
 $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
-$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803"
-$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
+$ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357"
+$ndkFolder = "c:\utils\android-ndk-$ndkVersion"
 $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"

 # SDK
-$toolsVersion = "26.1.1"
-$toolsFile = "sdk-tools-windows-4333796.zip"
+$sdkVersion = "r24.4.1"
 $sdkApi = "ANDROID_API_VERSION"
 $sdkApiLevel = "android-21"
-$sdkBuildToolsVersion = "28.0.3"
-$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
-$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
-$toolsChecksum = "aa298b5346ee0d63940d13609fe6bec621384510"
-$toolsFolder = "c:\Utils\Android\tools"
-$sdkZip = "c:\Windows\Temp\$toolsFile"
+$sdkBuildToolsVersion = "23.0.3"
+$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\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"
+$sdkZip = "c:\Windows\Temp\android_sdk_$sdkVersion.zip"

 function Install($1, $2, $3, $4) {
    $cacheUrl = $1
@@ -67,42 +66,41 @@ function Install($1, $2, $3, $4) {

    Download $offcialUrl $cacheUrl $zip
    Verify-Checksum $zip "$checksum"
-    Extract-7Zip $zip C:\Utils\Android
+    Extract-7Zip $zip C:\Utils
 }

-Write-Host "Installing Android NDK $nkdVersion"
+function SdkUpdate ($1, $2) {
+    Write-Host "Running Android SDK update for $1..."
+    cmd /c "echo y |$1\tools\android update sdk --no-ui --all --filter $2"
+}
+
+Write-Host "Installing Android ndk $nkdVersion"
 Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl
 Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder
 Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder

-Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl
-Set-EnvironmentVariable "ANDROID_SDK_HOME" C:\Utils\Android
+#Write-Host "Installing Android sdk $sdkVersion"
+Install $sdkCachedUrl $sdkZip $sdkChecksum $sdkOfficialUrl
+Set-EnvironmentVariable "ANDROID_SDK_HOME" $sdkFolder
 Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel

-if (IsProxyEnabled) {
-    $proxy = Get-Proxy
-    Write-Host "Using proxy ($proxy) with sdkmanager"
-    # Remove "http://" from the beginning
-    $proxy = $proxy.Remove(0,7)
-    $proxyhost,$proxyport = $proxy.split(':')
-    $sdkmanager_args = "--no_https --proxy=http --proxy_host=`"$proxyhost`" --proxy_port=`"$proxyport`" "
+# SDK update
+SdkUpdate $sdkFolder $sdkApiLevel
+SdkUpdate $sdkFolder tools
+SdkUpdate $sdkFolder platform-tools
+SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion
+
+# kill adb. This process prevents provisioning to continue
+$p = Get-Process -Name "adb" -ErrorAction:SilentlyContinue
+if ($p -ne $null) {
+    Write-Host "Stopping adb.exe"
+    Stop-Process -Force $p
+} else {
+    Write-Host "adb.exe not running"
 }

-New-Item -ItemType Directory -Force -Path C:\Utils\Android\licenses
-$licenseString = "`nd56f5187479451eabf01fb78af6dfcb131a6481e"
-Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 -InputObject $licenseString
-
-# Get a PATH where Java's path is defined from previous provisioning
-[Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process")
-
-$sdkmanager_args += " platforms;$sdkApiLevel tools platform-tools build-tools;$sdkBuildToolsVersion"
-Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args"
-cd $toolsFolder\bin\
-$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
-iex $command
-cmd /c "dir C:\Utils\android"
-
-Write-Output "Android SDK tools= $toolsVersion" >> ~/versions.txt
+Write-Output "Android SDK tools= $sdkVersion" >> ~/versions.txt
 Write-Output "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
 Write-Output "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
 Write-Output "Android NDK = $ndkVersion" >> ~/versions.txt
+
--- a/coin/provisioning/common/windows/disable-quickedit.ps1
+++ b/coin/provisioning/common/windows/disable-quickedit.ps1
@@ -1,13 +0,0 @@
-# Disabling cmd.exe and powershell QuickEdit && InsertMode
-#
-# These two can freeze console window on win10 sometimes
-# manual recovery is pressing enter on console window
-
-. "$PSScriptRoot\helpers.ps1"
-
-Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console`" /V QuickEdit /T REG_dWORD /D 0 /F"
-Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console`" /V InsertMode /T REG_dWORD /D 0 /F"
-Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_System32_WindowsPowerShell_v1.0_powershell.exe`" /V QuickEdit /T REG_dWORD /D 0 /F"
-Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_System32_WindowsPowerShell_v1.0_powershell.exe`" /V InsertMode /T REG_dWORD /D 0 /F"
-Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_SysWOW64_WindowsPowerShell_v1.0_powershell.exe`" /V QuickEdit /T REG_dWORD /D 0 /F"
-Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_SysWOW64_WindowsPowerShell_v1.0_powershell.exe`" /V InsertMode /T REG_dWORD /D 0 /F"
--- a/coin/provisioning/common/windows/fbx_windows.ps1
+++ b/coin/provisioning/common/windows/fbx_windows.ps1
@@ -37,11 +37,11 @@

 $version = "2016.1.2"

-$name = "fbx20161_2_fbxsdk_vs2015_win_nospace"
+$name = "fbx20161_2_fbxsdk_vs2015_win"
 $packageName = "$name.7z"
 $installerName = "$name.exe"
 $cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName"
-$sha1 = "de80edc255ffd5ce86ba25869dad72b4c809fd41"
+$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"

 # The executable is an interactive installer only. We can't run it in a script silently.
 # $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName"
@@ -49,7 +49,7 @@ $sha1 = "de80edc255ffd5ce86ba25869dad72b4c809fd41"
 # $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e"

 #$targetFile = "C:\Windows\Temp\$packageName"
-$targetFolder = "C:\Utils\"
+$targetFolder = "C:\Program Files\"

 #Write-Host "Downloading '$installerName'"
 #Download $officialUrl $cacheUrl $targetFile
@@ -60,7 +60,7 @@ Extract-7Zip $cacheUrl $targetFolder

 #Remove-Item -Recurse -Force "$packageName"

-Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX_SDK\2016.1.2"
+Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2"

 Write-Output "FBX SDK = $version" >> ~\versions.txt

--- a/coin/provisioning/common/windows/mqtt_broker.ps1
+++ b/coin/provisioning/common/windows/mqtt_broker.ps1
@@ -3,7 +3,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -35,8 +35,8 @@

 Write-Host "MQTT: Downloading Paho test broker..."
 $zip = Get-DownloadLocation "pahotest.zip"
-$commitSHA = "20bad2475c27a6e1d24a56d90a9fceb40963261e"
-$sha1 = "a0ac88715c2aebb9573a113dc13925a90da19233"
+$commitSHA = "5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
+$sha1 = "6afc375c2702eb36a960f38dd4912a3422d679fd"

 $internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
 $externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"
--- a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1
+++ b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1
@@ -1,59 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-. "$PSScriptRoot\helpers.ps1"
-
-$zip = Get-DownloadLocation "uasdkcpp.zip"
-$sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022"
-$installLocation = "C:\Utils\uacpp"
-
-Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
-$internalUrl = "http://ci-files01-hki.ci.local/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip"
-# No public download link exists
-$externalUrl = $internalUrl
-
-Download $externalUrl $internalUrl $zip
-Verify-Checksum $zip $sha1
-
-Write-Host "UACPPSDK: Installing $zip..."
-Extract-7Zip $zip (Get-DefaultDownloadLocation)
-Remove-Item -Path $zip
-
-$executable = (Get-DefaultDownloadLocation) + "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.exe"
-$arguments = "/S /D=$installLocation"
-Run-Executable $executable $arguments
-Write-Host "UACPPSDK: Installer done."
-Remove-Item $executable
-
-Write-Host "Set environment variable for COIN to locate SDK"
-Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation"
--- a/coin/provisioning/common/windows/open62541.ps1
+++ b/coin/provisioning/common/windows/open62541.ps1
@@ -1,265 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-Param (
-    [string]$targetCommand= ""
-    )
-
-. "$PSScriptRoot\helpers.ps1"
-
-## Variables for builds
-$commitSHA = "215651ab8db94e5eacdd10ec26a5a9fb96b9301f"
-$sha1 = "8d899f986071525be73e1ee8565b28ea10536d7d"
-$extractTarget = "C:\open62541_build"
-
-function CreateArchive
-{
-    param(
-        [string]$sourceDirectory=$(throw("You must specify a directory")),
-        [string]$archiveName=$(throw("You must specify an archive name"))
-    )
-
-    if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
-        $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
-        if (-not (test-path $zipExe)) {
-            $zipExe = "C:\Utils\sevenzip\7z.exe"
-            if (-not (test-path $zipExe)) {
-                throw "Could not find 7-zip."
-            }
-        }
-    } else {
-        $zipExe = "7z.exe"
-    }
-
-    Run-Executable $zipExe "a -y `"$archiveName`" `"$sourceDirectory`""
-}
-
-function PrepareRepository
-{
-    $username = $env:USERNAME
-    $zip = "c:\users\$username\downloads\open62541.zip"
-
-    $externalUrl = "https://github.com/open62541/open62541/archive/$commitSHA.zip"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/open62541/$commitSHA.zip"
-
-    Download $externalUrl $internalUrl $zip
-    Verify-Checksum $zip $sha1
-
-    Extract-7Zip $zip $extractTarget
-}
-
-function PushDevEnvironment
-{
-    # Provisioning updates the registry entries for PATH etc. However, they are not
-    # propagated to the next provisioning script and hence need to be manually
-    # read / set.
-    $adaptedPath = $env:PATH
-    $jomLocation = [Environment]::GetEnvironmentVariable("CI_JOM_PATH", "Machine")
-    $adaptedPath = $adaptedPath + ";" + $jomLocation
-    $adaptedPath = $adaptedPath + ";" + "C:\Python27"
-    $adaptedPath = $adaptedPath + ";" + "C:\CMake\bin"
-    [Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
-}
-
-function MSVCEnvironment
-{
-    Param (
-        [string]$msvcDir=$(throw("No VS Directory specified")),
-        [string]$msvcbat=$(throw("No vsvars batch file specified"))
-    )
-
-    Push-Location $msvcDir
-    cmd /c "$msvcbat&set" |
-    foreach {
-        if ($_ -match "=") {
-            $v = $_.split("="); Set-Item -force -path "ENV:\$($v[0])" -value "$($v[1])"
-        }
-    }
-    Pop-Location
-}
-
-function BuildAndInstallOpen62541
-{
-    Param (
-        [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
-        [string]$Platform=$(throw("You must specify the target platform [x86, x64]")),
-        [string]$MakeCommand=$(throw("You must specify a make command [mingw32-make, nmake]"))
-    )
-    Write-Host "### Open62541: Supposed to build with: $Type $Platform $MakeCommand"
-
-    ## Make Build directory
-    $buildDir = "$extractTarget\open62541-$commitSHA\build" + "_" + $Type + "_" + $Platform
-    if (Test-Path $buildDir) {
-        Write-Host " Deleting pre-existing build directory"
-        Remove-Item $buildDir -Force -Recurse
-    }
-    New-Item -ItemType Directory -Force -Path $buildDir
-    Push-Location $buildDir
-
-    ## Invoke Cmake
-    $makeGenerator = "NMake Makefiles JOM"
-    $installTarget = "C:\Utils\open62541" + "_" + $Type + "_" + $Platform
-    if (Test-Path $installTarget) {
-        Write-Host " Deleting pre-existing install directory"
-        Remove-Item $installTarget -Force -Recurse
-    }
-
-    if ($Type.StartsWith("mingw")) {
-        $makeGenerator = "MinGW Makefiles"
-    }
-    cmake -G "$makeGenerator" -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=$installTarget -DLIB_INSTALL_DIR:PATH=$installTarget/lib ..
-
-    ## Call build command
-    Write-Host "### Open62541: Compilation ###"
-    Run-Executable $MakeCommand
-
-    ## call install command
-    Write-Host "### Open62541: Installation ###"
-    Run-Executable $MakeCommand install
-
-    $platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform + "_PREFIX"
-    Set-EnvironmentVariable $platformVariable $installTarget
-
-    ## Packaging
-    Push-Location "C:\Utils"
-    $archiveName = "open62541_" + $Type + "_" + $Platform + ".7z"
-    CreateArchive $installTarget $archiveName
-    Pop-Location
-
-    ## cleanup build directory
-    Write-Host "### Open62541: Cleanup ###"
-    Pop-Location
-    Remove-Item $buildDir -Force -Recurse
-}
-
-function DownloadAndInstall
-{
-    Param (
-        [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
-        [string]$Platform=$(throw("You must specify the target platform [x86, x64]"))
-    )
-    $baseLocation = "http://ci-files01-hki.intra.qt.io/input/open62541/"
-    $targetName = "open62541_" + $Type + "_" + $Platform
-    $archiveName =  $targetName + ".7z"
-    $downloadUrl = $baseLocation + $archiveName
-
-    # Download
-    $downloadTarget = "C:\Utils\" + $archiveName
-    Download $downloadUrl $downloadUrl $downloadTarget
-
-    # Extract
-    Push-Location C:\Utils
-    Extract-7Zip $downloadTarget C:\Utils
-    Pop-Location
-
-    # Set environment variable
-    $platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform
-    $platformPath = "C:\Utils\" + $targetName
-    Set-EnvironmentVariable $platformVariable $platformPath
-}
-
-##############################
-# Startup                    #
-##############################
-if ($targetCommand.StartsWith("mingw")) {
-    Write-Host "### Creating Open62541 for MinGW"
-    $mingwPath = [Environment]::GetEnvironmentVariable($targetCommand, "Machine")
-    if (!$mingwPath) {
-        throw("Could not find mingw")
-    }
-
-    # Strawberry has its own gcc, put mingw in front
-    $adaptedPath = $mingwPath + "\bin;" + [Environment]::GetEnvironmentVariable("PATH", "Machine")
-    [Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
-
-    PushDevEnvironment
-    BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make"
-} elseif ($targetCommand -eq "msvc2015_x86") {
-    Write-Host "### Creating Open62541 for MSVC2015 x86"
-    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86"
-    PushDevEnvironment
-    BuildAndInstallOpen62541 msvc2015 x86 jom
-} elseif ($targetCommand -eq "msvc2015_x64") {
-    Write-Host "### Creating Open62541 for MSVC2015 x64"
-    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64"
-    PushDevEnvironment
-    BuildAndInstallOpen62541 msvc2015 x64 jom
-} elseif ($targetCommand -eq "msvc2017_x86") {
-    Write-Host "### Creating Open62541 for MSVC2017 x86"
-    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars32.bat
-    PushDevEnvironment
-    BuildAndInstallOpen62541 msvc2017 x86 jom
-} elseif ($targetCommand -eq "msvc2017_x64") {
-    Write-Host "### Creating Open62541 for MSVC2017 x64"
-    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars64.bat
-    PushDevEnvironment
-    BuildAndInstallOpen62541 msvc2017 x64 jom
-} elseif ($targetCommand -eq "prepare") {
-    PrepareRepository
-} elseif ($targetCommand -eq "build") {
-    Write-Host "### Building for all supported platforms"
-    PrepareRepository
-    Write-Host "### Invoking MinGW530 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw530
-    Write-Host "### Invoking MinGW630 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw630
-    Write-Host "### Invoking MinGW730 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw730
-    Write-Host "### Invoking MSVC2015 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x86
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x64
-    Write-Host "### Invoking MSVC2017 build"
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x86
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x64
-    Write-Host "### Archives have been generated at C:/Utils. Please upload manually"
-} elseif ($targetCommand -eq "packaged") {
-    Write-Host "### Expecting pre-built packages, download and install from archives"
-    Write-Host "### MinGW530 x64"
-    DownloadAndInstall mingw530 x86
-    Write-Host "### MinGW630 x64"
-    DownloadAndInstall mingw630 x86
-    Write-Host "### MinGW730 x64"
-    DownloadAndInstall mingw730 x64
-    Write-Host "### MSVC2015 x86"
-    DownloadAndInstall msvc2015 x86
-    Write-Host "### MSVC2015 x64"
-    DownloadAndInstall msvc2015 x64
-    Write-Host "### MSVC2017 x64"
-    DownloadAndInstall msvc2017 x64
-} elseif ($targetCommand) {
-    Write-Host "### Unknown parameter specified:" $targetCommand " Options are: mingw, msvc2015_x(86/64), msvc2017_x(86/64)"
-    throw("Unknown parameter")
-} else {
-    # Default behavior
-    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand build
-}
--- a/coin/provisioning/common/windows/openssl.ps1
+++ b/coin/provisioning/common/windows/openssl.ps1
@@ -36,7 +36,7 @@
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine

-$version = "1_0_2p"
+$version = "1_0_2o"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"

@@ -47,7 +47,7 @@ if (Is64BitWinHost) {
    $installFolder = "C:\openssl"
    $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-    $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6"
+    $sha1 = "86c71a28eda53fa406b957dd37491d616344b464"

    Write-Host "Fetching from URL ..."
    Download $externalUrl $internalUrl $packagex64
@@ -74,7 +74,7 @@ if (Is64BitWinHost) {

 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236"
+$sha1 = "bfc14fc03bd1d4dd03bf5459f62969d6b0ee96fe"

 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86
--- a/coin/provisioning/common/windows/python.ps1
+++ b/coin/provisioning/common/windows/python.ps1
@@ -3,7 +3,7 @@
 ## Copyright (C) 2016 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -83,7 +83,4 @@ if (IsProxyEnabled) {
 }
 Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install virtualenv"

-# Install PyPDF2 for QSR documentation
-Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install PyPDF2"
-
 Write-Output "Python-$archVer = $version" >> ~/versions.txt
--- a/coin/provisioning/common/windows/python3.ps1
+++ b/coin/provisioning/common/windows/python3.ps1
@@ -4,7 +4,7 @@
 ## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -79,15 +79,7 @@ if (IsProxyEnabled) {
    Write-Host "Using proxy ($proxy) with pip"
    $pip_args = "--proxy=$proxy"
 }
-Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel"
-
-# Install all needed packages in a special wheel cache directory
-$python3_wheel_dir="$install_path\python3-wheels"
-Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args wheel --wheel-dir $python3_wheel_dir -r $PSScriptRoot\..\shared\requirements.txt"
-Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir"
-
-# Install PyPDF2 for QSR documentation
-Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install PyPDF2"
+Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv"

 Write-Output "Python3-$archVer = $version" >> ~/versions.txt

--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -38,11 +38,11 @@
 # NOTE! Make sure 64bit versions are always installed before 32bit,
 # because they use same folder name before a rename

-$version = "6.3.2"
+$version = "6.3.0"

 # Qt branch without dot (*.*)
-$qtBranch = "510x"
-# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point
+$qtBranch = "59x"
+# So far Squish built with Qt5.9 works also with 5.10 and 5.11, but we have to be prepared that on some point
 # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.

 $targetDir = "C:\Utils\squish"
--- a/coin/provisioning/common/windows/vc_redist.ps1
+++ b/coin/provisioning/common/windows/vc_redist.ps1
@@ -4,7 +4,7 @@
 ## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/common/windows/vclibs_debug.ps1
+++ b/coin/provisioning/common/windows/vclibs_debug.ps1
@@ -1,23 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-function Install-VCLibsDebug
-{
-    Param (
-        [string]$Arch
-    )
-
-    $installedPackage = Get-AppxPackage Microsoft.VCLibs.140.00.Debug | Where-Object {$_.Architecture -eq $Arch}
-    if ($installedPackage) {
-        Write-Host "Debug VCLibs already installed for $Arch."
-        return
-    }
-
-    if (Is64BitWinHost) {
-        $ProgramFiles = "Program Files (x86)"
-    } else {
-        $ProgramFiles = "Program Files"
-    }
-    Add-AppxPackage "C:\$ProgramFiles\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\Appx\Debug\$Arch\Microsoft.VCLibs.$Arch.Debug.14.00.appx"
-
-    Write-Host "Debug VCLibs successfully installed for $Arch."
-}
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh
@@ -35,10 +35,9 @@

 set -ex

-function waitLoop {
+# refresh local certificates
+sudo subscription-manager refresh
+
+# Attach available subscriptions to system. This is needed when subscriptions are renewed.
+sudo subscription-manager attach --auto

-while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
-    echo "Waiting for other software managers to finish..."
-    sleep 0.5
-done
-}
--- 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
@@ -33,6 +33,12 @@
 ##
 #############################################################################

-# Disable spotlight and and stop indexing
-sudo mdutil -a -i off
-sudo defaults write /.Spotlight-V100/VolumeConfiguration Exclusions -array "/Volumes"
+set -ex
+
+# shellcheck source=../common/unix/check_and_set_proxy.sh
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
+
+# shellcheck disable=SC2031
+if [ "$http_proxy" != "" ]; then
+    echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
+fi
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh
@@ -33,6 +33,17 @@
 ##
 #############################################################################

-set -ex
+# shellcheck source=../common/unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+
+package="epel-release-6-8.noarch.rpm"
+primaryUrl="https://dl.fedoraproject.org/pub/epel/6/x86_64/Packages/e/$package"
+cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel6/$package"
+sha1="2b2767a5ae0de30b9c7b840f2e34f5dd9deaf19a"
+targetFile="/tmp/$package"
+
+DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
+
+sudo rpm -ivh "$targetFile"
+rm "$targetFile"

-source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh"
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# provides: fix for possible bug in the subscription manager
+# version: provided by RedHat
+# needed for yum to work properly in case there is incorrect data in
+# the sslclientkey repository parameter value
+
+set -ex
+
+sudo rm -f /etc/pki/entitlement/*
+sudo subscription-manager refresh
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# provides: odbc devel packages on RHEL
+# version: provided by default Linux distribution repository
+# needed for configure -plugin-sql-odbc in qtbase
+
+set -ex
+
+sudo yum install -y unixODBC-devel
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
@@ -32,7 +32,8 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-
 set -ex

-source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/unix/libclang.sh
+"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# provides: python development libraries
+# version: provided by default Linux distribution repository
+# needed to build pyside
+
+set -ex
+
+sudo yum install -y python-devel python-virtualenv
+
+# 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
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+"$(dirname "$0")/../common/linux/cmake_linux.sh"
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Required for tqtc-boot2qt/qdb
+
+set -ex
+
+sudo yum install -y libusb1-devel
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
@@ -2,10 +2,10 @@

 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -33,4 +33,5 @@
 ##
 #############################################################################

+# shellcheck source=../common/unix/mqtt_broker.sh
 source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# shellcheck source=../common/unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+
+# This script installs the right ICU version
+
+set -ex
+icuVersion="56.1"
+icuLocation="/usr/lib64"
+sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
+
+function Install7ZPackageFromURL {
+    url=$1
+    urlExt=$2
+    expectedSha1=$3
+    targetDirectory=$4
+
+    targetFile=$(mktemp)
+    DownloadURL "$url" "$urlExt" "$expectedSha1" "$targetFile"
+    sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile"
+    rm "$targetFile"
+}
+
+echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
+
+baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
+baseBinaryPackageExternalUrl="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
+Install7ZPackageFromURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalUrl" "$sha1" "/usr/lib64"
+
+echo "Installing custom ICU devel packages on RHEL"
+
+sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
+develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
+develPackageExternalUrl="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
+tempDir=$(mktemp -d)
+# shellcheck disable=SC2064
+trap "sudo rm -fr $tempDir" EXIT
+Install7ZPackageFromURL "$develPackageURL" "$develPackageExternalUrl" "$sha1Dev" "$tempDir"
+sudo cp -a "$tempDir/lib"/* /usr/lib64
+sudo cp -a "$tempDir"/* /usr/
+
+sudo /sbin/ldconfig
+
+# Storage version information to ~/versions.txt, which is used to print version information to provision log.
+echo "ICU = $icuVersion" >> ~/versions.txt
+
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2016 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -33,6 +33,16 @@
 ##
 #############################################################################

+# This script needs to be called last during provisioning so that the software information will show up last in provision log.
+
+# Storage installed RPM packages information
+
 set -ex

-source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"
+# shellcheck disable=SC2129
+echo "*********************************************" >> ~/versions.txt
+echo "***** All installed RPM packages *****" >> ~/versions.txt
+rpm -q -a | sort >> ~/versions.txt
+echo "*********************************************" >> ~/versions.txt
+
+"$(dirname "$0")/../common/linux/version.sh"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -106,11 +106,4 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
 # We shouldn't use yum to install virtualenv. The one found from package repo is not
 # working, but we can use installed pip
 sudo pip install --upgrade pip
-sudo pip install virtualenv wheel
-
-sudo /usr/local/bin/pip3 install wheel
-# Install all needed packages in a special wheel cache directory
-/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+sudo pip install virtualenv
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
@@ -110,7 +110,6 @@ installPackages+=(python-pip)
 installPackages+=(python3-dev)
 installPackages+=(python3-pip)
 installPackages+=(python3-virtualenv)
-installPackages+=(python3-wheel)
 # Needed to be able to build Yocto
 installPackages+=(chrpath)
 installPackages+=(gawk)
@@ -158,27 +157,15 @@ installPackages+=(libbluetooth-dev)
 #VirtualBox for RTA
 installPackages+=(virtualbox)
 installPackages+=(dkms)
-#Pypdf for QSR documentation
-installPackages+=(python-pypdf2)
-
-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/ xenial main restricted universe multiverse
-deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse
-deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe
-deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse
-deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse
-deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse
-deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe
-deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse
-EOC

 echo "Running update for apt"
 sudo apt-get update
 echo "Installing packages"
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"

-# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+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/ xenial main restricted universe multiverse
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse
+EOC
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh
@@ -45,82 +45,8 @@ cd "$tempDir"

 #latest commit from the master proven to work
 git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f
-git cherry-pick 75e5b70e6b5dcc4f2219992d7cffa462aa406af0
-git cherry-pick 04b33e21866412689f18b7ad6daf0a54d8f959a7
 git submodule update --init pixman
-
-patch -p1 <<EOT
-From aad6a8f17dc7ad3681d2d98a01e474a8904a129b Mon Sep 17 00:00:00 2001
-From: Simon Hausmann <simon.hausmann@qt.io>
-Date: Fri, 24 Aug 2018 10:38:29 +0200
-Subject: [PATCH] linux-user: add support for MADV_DONTNEED
-
-Most flags to madvise() are just hints, so typically ignoring the
-syscall and returning okay is fine. However applications exist that do
-rely on MADV_DONTNEED behavior to guarantee that upon subsequent access
-the mapping is refreshed from the backing file or zero for anonymous
-mappings.
---
- linux-user/mmap.c    | 18 ++++++++++++++++++
- linux-user/qemu.h    |  1 +
- linux-user/syscall.c |  6 +-----
- 3 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/linux-user/mmap.c b/linux-user/mmap.c
-index 61685bf79e..cb3069f27e 100644
--- a/linux-user/mmap.c
-+++ b/linux-user/mmap.c
-@@ -764,3 +764,16 @@ int target_msync(abi_ulong start, abi_ulong len, int flags)
-     start &= qemu_host_page_mask;
-     return msync(g2h(start), end - start, flags);
- }
-+
-+int target_madvise(abi_ulong start, abi_ulong len, int flags)
-+{
-+    /* A straight passthrough may not be safe because qemu sometimes
-+       turns private file-backed mappings into anonymous mappings.
-+       Most flags are hints, except for MADV_DONTNEED that applications
-+       may rely on to zero out pages, so we pass that through.
-+       Otherwise returning success is ok. */
-+    if (flags & MADV_DONTNEED) {
-+        return madvise(g2h(start), len, MADV_DONTNEED);
-+    }
-+    return 0;
-+}
-diff --git a/linux-user/qemu.h b/linux-user/qemu.h
-index 4edd7d0c08..3c975909a1 100644
--- a/linux-user/qemu.h
-+++ b/linux-user/qemu.h
-@@ -429,6 +429,7 @@ int target_munmap(abi_ulong start, abi_ulong len);
- abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
-                        abi_ulong new_size, unsigned long flags,
-                        abi_ulong new_addr);
-+int target_madvise(abi_ulong start, abi_ulong len, int flags);
- int target_msync(abi_ulong start, abi_ulong len, int flags);
- extern unsigned long last_brk;
- extern abi_ulong mmap_next_start;
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 11a311f9db..94d8abc745 100644
--- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -11148,11 +11148,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
-
- #ifdef TARGET_NR_madvise
-     case TARGET_NR_madvise:
-        /* A straight passthrough may not be safe because qemu sometimes
-           turns private file-backed mappings into anonymous mappings.
-           This will break MADV_DONTNEED.
-           This is a hint, so ignoring and returning success is ok.  */
-        ret = get_errno(0);
-+        ret = get_errno(target_madvise(arg1, arg2, arg3));
-         break;
- #endif
- #if TARGET_ABI_BITS == 32
--
-2.17.1
-EOT
-
-./configure --target-list=arm-linux-user,aarch64-linux-user --static --disable-werror
+./configure --target-list=arm-linux-user,aarch64-linux-user --static
 make
 sudo make install
 rm -rf "$tempDir"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"

 echo "Installing Yocto toolchain for 32-bit b2qt..."

-versionARM="2.3.4"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh"
+versionARM="2.3.1"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-41b0b46.sh"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
 AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
-SHA1="db7a0f4f9ddd5992a563d5348889021a7ceb1c56"
+SHA1="f17cce550c9d2148f11ae5c760f43a67e9813a45"
 yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
 yoctoLocationARMv7="/opt/yocto-armv7"
 sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi"
@@ -60,11 +60,11 @@ rm -rf "$yoctoInstaller"

 echo "Installing Yocto toolchain for 64-bit b2qt..."

-versionARM64="2.3.4"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh"
+versionARM64="2.3.1"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-41b0b46.sh"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
 AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
-SHA1="5dcae7c6cbc266798ba49a9e51fff1f06790729d"
+SHA1="b49d7ec8a6339dda5a82815dc31fed1fae00851d"
 yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
 yoctoLocationARM64="/opt/yocto-arm64"
 sysrootARM64="sysroots/aarch64-poky-linux"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+sudo apt-get update
+sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev
+
+TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
+trap "sudo rm -fr $TEMPDIR" EXIT
+cd $TEMPDIR
+git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua
+cd freeopcua
+git checkout 955cc5b924cf310fc15b376a11f4b7b9db28980b
+mkdir build
+cd build
+source ~/.profile
+cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..
+make
+sudo make install
+sudo /sbin/ldconfig
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/docker.sh
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/99-version.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/99-version.sh
@@ -43,4 +43,4 @@ echo "***** All installed packages *****" >> ~/versions.txt
 apt list --installed >> ~/versions.txt
 echo "*********************************************" >> ~/versions.txt

-"$(dirname "$0")/version.sh"
+"$(dirname "$0")/../common/linux/version.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script modifies system settings for automated use
-
-set -ex
-
-# shellcheck source=../common/unix/check_and_set_proxy.sh
-source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
-
-NTS_IP=10.212.2.216
-
-echo "Set timezone to UTC."
-sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-echo "Set grub timeout to 0"
-sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
-sudo update-grub
-
-# https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1624320
-echo "Setting up workaround for Ubuntu systemd resolve bug"
-sudo rm -f /etc/resolv.conf
-sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
-
-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
-
-echo 'LC_ALL=en_US.UTF8' | sudo tee /etc/default/locale
-
-if [ "$http_proxy" != "" ]; then
-    echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf
-fi
-
-# This script diverts qtlogging.ini file so we don't get debugging related auto-test failures.
-sudo dpkg-divert --divert /etc/xdg/QtProject/qtlogging.ini.foo --rename /etc/xdg/QtProject/qtlogging.ini
--- 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
@@ -1,172 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# Install required packages with APT
-
-# shellcheck source=../common/linux/apt_wait_loop.sh
-source "${BASH_SOURCE%/*}/../common/linux/apt_wait_loop.sh"
-
-echo "Disabling auto update"
-sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic
-for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do
-    sudo systemctl stop $service
-    sudo systemctl disable $service
-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
-EOC
-}
-
-(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
-
-# Git is not needed by builds themselves, but is nice to have
-# immediately as one starts debugging
-installPackages+=(git)
-# 7zip is a needed decompressing tool
-installPackages+=(p7zip-full)
-# To be able to mount yocto-cache during builds
-installPackages+=(nfs-common)
-# libssl-dev provides headers for OpenSSL
-installPackages+=(libssl-dev)
-# Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git
-installPackages+=("^libxcb.*")
-installPackages+=(libxkbcommon-dev)
-installPackages+=(libxkbcommon-x11-dev)
-installPackages+=(libx11-xcb-dev)
-installPackages+=(libglu1-mesa-dev)
-installPackages+=(libxrender-dev)
-installPackages+=(libxi-dev)
-# Enable linking to system dbus
-installPackages+=(libdbus-1-dev)
-# Needed libraries for WebEngine
-installPackages+=(libudev-dev)
-installPackages+=(libegl1-mesa-dev)
-installPackages+=(libfontconfig1-dev)
-installPackages+=(libxss-dev)
-# Common event loop handling
-installPackages+=(libglib2.0-dev)
-# MySQL support
-installPackages+=(libmysqlclient-dev)
-# PostgreSQL support
-installPackages+=(libpq-dev)
-# SQLite support
-installPackages+=(libsqlite3-dev)
-# ODBC support
-installPackages+=(unixodbc-dev)
-# Support for FreeType font engine
-installPackages+=(libfreetype6-dev)
-# Enable the usage of system jpeg libraries
-installPackages+=(libjpeg-dev)
-# Enable support for printer driver
-installPackages+=(libcups2-dev)
-# Install libraries needed for QtMultimedia to be able to support all plugins
-installPackages+=(libasound2-dev)
-installPackages+=(libgstreamer1.0-dev)
-installPackages+=(libgstreamer-plugins-base1.0-dev)
-installPackages+=(libgstreamer-plugins-good1.0-dev)
-installPackages+=(libgstreamer-plugins-bad1.0-dev)
-# Support for cross-building to x86 (needed by WebEngine boot2qt builds)
-installPackages+=(g++-multilib)
-# python3 development package
-installPackages+=(python3-dev)
-installPackages+=(python3-pip)
-installPackages+=(python3-virtualenv)
-installPackages+=(python3-wheel)
-# python2 development package
-installPackages+=(python-dev)
-# Automates interactive applications (Needed by RTA to automate configure testing)
-installPackages+=(expect)
-installPackages+=(mesa-common-dev)
-installPackages+=(libgl1-mesa-glx)
-installPackages+=(libgl1-mesa-dev)
-installPackages+=(libegl1-mesa-dev)
-installPackages+=(curl)
-installPackages+=(libicu-dev)
-installPackages+=(zlib1g-dev)
-installPackages+=(zlib1g)
-installPackages+=(openjdk-8-jdk)
-installPackages+=(libgtk-3-dev)
-installPackages+=(ninja-build)
-installPackages+=(libssl-dev)
-installPackages+=(libxcursor-dev)
-installPackages+=(libxcomposite-dev)
-installPackages+=(libxdamage-dev)
-installPackages+=(libxrandr-dev)
-installPackages+=(libfontconfig1-dev)
-installPackages+=(libxss-dev)
-installPackages+=(libsrtp0-dev)
-installPackages+=(libwebp-dev)
-installPackages+=(libjsoncpp-dev)
-installPackages+=(libopus-dev)
-installPackages+=(libminizip-dev)
-installPackages+=(libavutil-dev)
-installPackages+=(libavformat-dev)
-installPackages+=(libavcodec-dev)
-installPackages+=(libevent-dev)
-installPackages+=(bison)
-installPackages+=(flex)
-installPackages+=(gperf)
-installPackages+=(libasound2-dev)
-installPackages+=(libpulse-dev)
-installPackages+=(libxtst-dev)
-installPackages+=(libnspr4-dev)
-installPackages+=(libnss3-dev)
-installPackages+=(libnss3)
-installPackages+=(libopenal-dev)
-installPackages+=(libbluetooth-dev)
-#VirtualBox for RTA
-installPackages+=(virtualbox)
-installPackages+=(dkms)
-# Needed for qtspeech
-installPackages+=(libspeechd-dev)
-
-echo "Running update for apt"
-waitLoop
-sudo apt-get update
-echo "Installing packages"
-waitLoop
-sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
-
-# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-# shellcheck source=../common/linux/gcc.sh
-source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
-
-InstallGCC 8.2.0 50 19e40bea7df5dbadb22eec09ada621ecd9235687 19926bdb6c4b58891015929853d41aeff019d400
-
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/libclang.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/linux/fbx_linux.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-# shellcheck source=../common/linux/android_linux.sh
-source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/linux/cmake_linux.sh"
-
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/docker.sh
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/squishInstall.sh"
-
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/ubuntu-version.sh
--- 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
@@ -10,24 +10,15 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"

 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc

-sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub
-sudo grub2-mkconfig -o /boot/grub2/grub.cfg
-
 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
-
-while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do
-    echo "Waiting for PackageKit to finish..."
-    sleep 0.5
-done
-echo "Disabling update notifications"
+echo "Disable update notifications"
 sudo zypper -nq remove plasma5-pk-updates

-
 # shellcheck disable=SC2031
 if [ "$http_proxy" != "" ]; then
    sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
@@ -9,10 +9,4 @@ sudo pkcon -y refresh
 sudo pkcon -y install python-devel python-virtualenv

 # install python3
-sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
-
-# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
@@ -87,5 +87,3 @@ sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resourc

 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
-
-sudo systemsetup settimezone GMT
--- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-$(dirname "$0")/../common/macos/disable_spotlight.sh
--- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
@@ -5,7 +5,7 @@
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
--- a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -47,15 +47,15 @@ sdkTargetFolder="$targetFolder/sdk"

 basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"

-toolsVersion="r26.1.1"
-toolsFile="sdk-tools-darwin-4333796.zip"
-ndkVersion="r18b"
+toolsVersion="r25.2.5"
+toolsFile="tools_$toolsVersion-macosx.zip"
+ndkVersion="r10e"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="28.0.3"
+sdkBuildToolsVersion="25.0.2"
 sdkApiLevel="android-21"

-toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
-ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440"
+toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659"
+ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -73,9 +73,6 @@ sudo chown -R qt:wheel "$targetFolder"
 echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
 (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"

-echo "Checking the contents of Android SDK..."
-ls -l "$sdkTargetFolder"
-
 SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
 SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
 SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
--- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"

-opensslVersion="1.0.2p"
+opensslVersion="1.0.2o"
 opensslFile="openssl-$opensslVersion.tar.gz"
 opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
 opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
-opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"
+opensslSha1="a47faaca57b47a0d9d5fb085545857cc92062691"

 # Below target location has been hard coded into Coin.
 # QTQAINFRA-1195
--- a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,7 +36,7 @@
 # This script installs QNX 7.

 targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip"
+sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20180801-macos.zip"
 folderName="qnx700"

 sudo mkdir -p "$targetFolder"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Qt Submodule Update Bot	967d28eed2	Update submodules on '5.11.2' in qt5 Change-Id: Iffc768a304dedfd645219db18ce10fb77515710f Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-13 15:33:30 +00:00
Qt Submodule Update Bot	384ca26700	Update submodules on '5.11.2' in qt5 Change-Id: Icf8612cbd19dcd417956ce4d56634e7f5a31369e Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-12 19:49:09 +00:00