Update submodules on '5.8.0' in qt5

Change-Id: I060ef5334c8d096c6167663b5c2dd8d45a5a2aec
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.7
+	branch = 5.8.0
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt qtwebkit
 	path = qttools
 	url = ../qttools.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -74,7 +74,7 @@
 	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.7
+	branch = 5.8.0
 	status = obsolete
 	project = WebKit.pro
 	priority = 20
@@ -82,7 +82,7 @@
 	depends = qtwebkit qttools
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.7
+	branch = 5.8.0
 	status = obsolete
 [submodule "qtqa"]
 	depends = qtbase
@@ -93,17 +93,17 @@
 	priority = 50
 [submodule "qtlocation"]
 	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
+	recommends = qtdeclarative qtquickcontrols qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative qtsvg
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -136,177 +136,184 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtdeclarative qtimageformats
 	recommends = qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
 	recommends = qtxmlpatterns
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.7
+	branch = dev
 	status = ignore
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.7
-	status = preview
+	branch = 5.8.0
+	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 5.7
+	branch = dev
 	status = ignore
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad
-	branch = 5.7
+	branch = 5.8.0
 	status = preview
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml
-	branch = 5.7
-	status = preview
+	branch = 5.8.0
+	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech
-	branch = dev
-	status = ignore
+	branch = 5.8.0
+	status = preview
+[submodule "qtnetworkauth"]
+	depends = qtbase
+	recommends = qtwebview
+	path = qtnetworkauth
+	url = ../qtnetworkauth
+	branch = 5.8.0
+	status = preview

coin/platform_configs/default.txt

@@ -1,24 +0,0 @@
-Template                            Target OS           Target arch     Compiler    Features
------------------------------------ ------------------- --------------- ----------- -----------------------------------------------------------------
-qtci-windows-8-x86_64                                                   MSVC2013    DeveloperBuild Release BuildExamples
-qtci-windows-10-x86_64                                                  MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix
-qtci-windows-8-x86                                                      MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-8-x86_64                                                   MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-7-x86                                                      Mingw53     Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86                                                     MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86_64                                                  MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-8-x86_64               Windows_Phone_8_1   armv4           MSVC2013    Packaging DebugAndRelease Release DisableTests
-qtci-windows-8-x86_64               WinRT_8_1                           MSVC2013    Packaging DebugAndRelease Release DisableTests
-qtci-linux-Ubuntu-14.04-x86_64                                          GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-14.04-x86_64                                          GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
-qtci-linux-OpenSuSE-13.01-x86_64                                        GCC         DeveloperBuild NoPch
-qtci-linux-RHEL-6.6-x86_64                                              GCC         Packaging Release NoUseGoldLinker
-qtci-osx-10.10-x86_64                                                   Clang       Packaging DebugAndRelease Release
-qtci-osx-10.9-x86_64                                                    Clang       DeveloperBuild Release QtNamespace NoPch
-qtci-osx-10.8-x86_64                                                    Clang       Release NoFramework
-qtci-linux-RHEL-6.6-x86_64          Android_ANY         armv7           GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64      Boot2Qt_Jethro      armv7           GCC         DisableTests
-qtci-linux-Ubuntu-15.04-x86_64      UbuntuTouch_15_04   armv7           GCC         Packaging DisableTests OpenGLES2
-qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7           GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64                                          GCC         TestOnly LicenseCheck
-qtci-osx-10.10-x86_64               IOS_ANY             x86_64          Clang       Release DisableTests Static

coin/platform_configs/qt5.txt

@@ -1,20 +0,0 @@
-Template                    Target OS           Target arch Compiler    Features
---------------------------- ------------------- ----------- ----------- -----------------------------------------------------------------
-qtci-windows-8-x86_64       Windows_Phone_8_1   x86         MSVC2013    Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86_64      WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86_64      WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
-
-# target arch is used here only for documentation the value is ignored
-qtci-windows-10-x86_64      WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests
-
-# qtci-osx-10.8-x86_64                                      Clang       Release NoFramework
-qtci-linux-RHEL-6.6-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86          Android_ANY         armv7       Mingw49     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86          Android_ANY         x86         Mingw49     Packaging Release DisableTests OpenGLES2
-qtci-osx-10.10-x86_64       Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
-qtci-osx-10.10-x86_64       Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
-qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86          QNX_660             armv7       Mingw49     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86          QNX_660             x86         Mingw49     Packaging Release DisableTests OpenGLES2
-
-qtci-osx-10.10-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static

coin/provisioning/common/02-python.ps1

@@ -64,5 +64,3 @@ del $package
 Add-Path $path
 
 & python -m ensurepip
-# Install python virtual env
-pip.exe install virtualenv

coin/provisioning/common/DownloadURL.sh

@@ -1,85 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $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$
-##
-#############################################################################
-
-# A helper script used for downloading a file from a URL or an alternative
-# URL. Also the SHA1 is checked for the file. Target filename should also
-# be given.
-#
-# If called directly from another script, it will exit the parent script
-# as well, if not called in its own subshell with parentheses.
-
-# shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
-
-ExceptionDownloadPrimaryUrl=100
-ExceptionDownloadAltUrl=101
-ExceptionSHA1=102
-
-function DownloadURL {
-    url=$1
-    url_alt=$2
-    expectedSha1=$3
-    targetFile=$4
-
-    try
-    (
-        try
-        (
-            echo "Downloading from primary URL '$url'"
-            curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl
-        )
-        catch || {
-            case $ex_code in
-                $ExceptionDownloadPrimaryUrl)
-                    echo "Failed to download '$url' multiple times"
-                    echo "Downloading tar.gz from alternative URL '$url_alt'"
-                    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl
-                ;;
-            esac
-        }
-        echo "Checking SHA1 on PKG '$targetFile'"
-        echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
-    )
-
-    catch || {
-        case $ex_code in
-            $ExceptionDownloadAltUrl)
-                echo "Failed downloading PKG from primary and alternative URLs"
-                exit 1;
-            ;;
-        esac
-    }
-}
-

coin/provisioning/common/InstallFromCompressedFileFromURL.sh

@@ -1,120 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $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=try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
-# shellcheck source=DownloadURL.sh
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
-
-ExceptionCreateTmpFile=100
-ExceptionCreateTmpDirectory=101
-ExceptionUncompress=102
-ExceptionMoveApp=103
-ExceptionDeleteTmpFile=104
-ExceptionRemoveTmpDirectory=105
-ExceptionUnknownFormat=106
-
-
-function InstallFromCompressedFileFromURL {
-    url=$1
-    url_alt=$2
-    expectedSha1=$3
-    installDirectory=$4
-    appPrefix=$5
-
-    try
-    (
-        basefilename=${url##*/}
-        extension=${basefilename##*.}
-        filename=${basefilename%.*}
-        if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
-            extension="tar.gz"
-        fi
-        echo "Extension for file: $extension"
-        echo "Creating temporary file and directory"
-        targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension") || throw $ExceptionCreateTmpFile
-        targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
-        DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
-        echo "Uncompress $targetFile"
-        case $extension in
-            "tar.gz")
-                tar -xzf "$targetFile" --directory "$targetDirectory" || throw $ExceptionUncompress
-            ;;
-            "zip")
-                unzip "$targetFile" -d "$targetDirectory" || throw $ExceptionUncompress
-            ;;
-            *)
-                throw $ExceptionUnknownFormat
-            ;;
-        esac
-        echo "Moving app to $installDirectory"
-        sudo mkdir "$installDirectory"
-        sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory" || throw $ExceptionMoveApp
-        echo "Removing file '$targetFile'"
-        rm "$targetFile" || throw $ExceptionDeleteTmpFile
-        echo "Removing directory '$targetDirectory'"
-        rm -rf "$targetDirectory" || throw $ExceptionRemoveTmpDirectory
-    )
-
-    catch || {
-        case $ex_code in
-            $ExceptionCreateTmpFile)
-                echo "Failed to create temporary file"
-                exit 1;
-            ;;
-            $ExceptionUncompress)
-                echo "Failed extracting compressed file."
-                exit 1;
-            ;;
-            $ExceptionMoveApp)
-                echo "Failed moving app to target location."
-                exit 1;
-            ;;
-            $ExceptionDeleteTmpFile)
-                echo "Failed deleting temporary file."
-                exit 1;
-            ;;
-            $ExceptionRemoveTmpDirectory)
-                echo "Failed deleting temporary file."
-                exit 1;
-            ;;
-            $ExceptionUnknownFormat)
-                echo "Unknown file format."
-                exit 1;
-            ;;
-        esac
-    }
-}
-

coin/provisioning/common/try_catch.sh

@@ -1,64 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $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$
-##
-#############################################################################
-
-echo "Sourcing try_catch.sh"
-
-function try()
-{
-    [[ $- = *e* ]]; SAVED_OPT_E=$?
-    set +e
-}
-
-function throw()
-{
-    exit "$1"
-}
-
-function catch()
-{
-    export ex_code=$?
-    (( SAVED_OPT_E )) && set +e
-    return $ex_code
-}
-
-function throwErrors()
-{
-    set -e
-}
-
-function ignoreErrors()
-{
-    set +e
-}

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh

@@ -1,4 +0,0 @@
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo yum install -y python-devel python-virtualenv

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh

@@ -0,0 +1,3 @@
+#!/bin/env bash
+# Required for tqtc-boot2qt/qdb
+sudo yum install -y libusb1-devel

coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh

@@ -1,5 +0,0 @@
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo subscription-manager refresh
-sudo yum install -y python-devel python-virtualenv

coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh

@@ -1,53 +0,0 @@
-#!/bin/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$
-##
-#############################################################################
-
-# This script installs CMake 3.6.2
-
-# CMake is needed for autotests that verify that Qt can be built with CMake
-
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
-
-version="3.6.2"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
-SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
-targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
-
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc

coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh

@@ -0,0 +1,5 @@
+# We need to disable selinux while we are overwriting some binaries
+# required by it. If this is not done, ICU provisioning will create
+# template that is not booting.
+
+sudo sed -i s/SELINUX=enforcing/SELINUX=disabled/g  /etc/selinux/config

coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/env bash
 
 #############################################################################
 ##
@@ -33,21 +33,38 @@
 ##
 #############################################################################
 
-# This script installs CMake 3.6.2
+# This script installs the right ICU version
 
-# CMake is needed for autotests that verify that Qt can be built with CMake
+set -e
+icuVersion="56.1"
+icuLocation="/usr/lib64"
+sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c"
 
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+function Install7ZPackageFromURL {
+    url=$1
+    expectedSha1=$2
+    targetDirectory=$3
 
-version="3.6.2"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
-SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
-targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
+    targetFile=`mktemp` || echo "Failed to create temporary file"
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
+    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive"
+    rm $targetFile
+}
 
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
 
-echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
+baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z"
+Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
+
+echo "Installing custom ICU devel packages on RHEL"
+
+sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864"
+develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
+tempDir=`mktemp -d` || echo "Failed to create temporary directory"
+trap "sudo rm -fr $tempDir" EXIT
+Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
+sudo cp -a $tempDir/lib/* /usr/lib64
+sudo cp -a $tempDir/* /usr/
+
+sudo /sbin/ldconfig

coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh

@@ -0,0 +1,9 @@
+# gstreamer 1 for QtMultimedia
+# gtk3 style for QtGui/QStyle
+# libusb1 for tqtc-boot2qt/qdb
+
+sudo yum install -y \
+    gstreamer1-devel gstreamer1-plugins-base-devel \
+    gtk3-devel \
+    libusb1-devel
+

coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-
-# Disable questions on shutdown.
-gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true

coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh

@@ -1,6 +0,0 @@
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-
-sudo apt-get update
-sudo apt-get install -y python-dev

coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh

@@ -1,53 +0,0 @@
-#!/bin/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$
-##
-#############################################################################
-
-# This script installs CMake 3.6.2
-
-# CMake is needed for autotests that verify that Qt can be built with CMake
-
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
-
-version="3.6.2"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
-SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
-targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
-
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc

coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh

@@ -0,0 +1,3 @@
+#!/bin/env bash
+# Required for tqtc-boot2qt/qdb
+sudo apt-get install -y libusb-1.0-0-dev

coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-
-# Disable questions on shutdown.
-gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-
-# Disable questions on shutdown.
-gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true

coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh

@@ -1,53 +0,0 @@
-#!/bin/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$
-##
-#############################################################################
-
-# This script installs CMake 3.6.2
-
-# CMake is needed for autotests that verify that Qt can be built with CMake
-
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
-
-version="3.6.2"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
-SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
-targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
-
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc

coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-mkdir -p $HOME/Library/LaunchAgents
-cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>org.qt.io.screensaver_disable</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>defaults</string>
-            <string>-currentHost</string>
-            <string>write</string>
-            <string>com.apple.screensaver</string>
-            <string>idleTime</string>
-            <string>0</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-    </dict>
-</plist>
-EOT

coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-mkdir -p $HOME/Library/LaunchAgents
-cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>org.qt.io.screensaver_disable</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>defaults</string>
-            <string>-currentHost</string>
-            <string>write</string>
-            <string>com.apple.screensaver</string>
-            <string>idleTime</string>
-            <string>0</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-    </dict>
-</plist>
-EOT

coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-mkdir -p $HOME/Library/LaunchAgents
-cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>org.qt.io.screensaver_disable</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>defaults</string>
-            <string>-currentHost</string>
-            <string>write</string>
-            <string>com.apple.screensaver</string>
-            <string>idleTime</string>
-            <string>0</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-    </dict>
-</plist>
-EOT

coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-mkdir -p $HOME/Library/LaunchAgents
-cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>org.qt.io.screensaver_disable</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>defaults</string>
-            <string>-currentHost</string>
-            <string>write</string>
-            <string>com.apple.screensaver</string>
-            <string>idleTime</string>
-            <string>0</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-    </dict>
-</plist>
-EOT

coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1

@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1

@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled

coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt

@@ -1,2 +1,2 @@
-1482492127
-conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3
+1478098249
+conanfile.py: f66225cf233d8eee6c6c6b4832d81b79

coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt

@@ -1,10 +1,8 @@
-1482491156
-bin/icudt57.dll: 31229bc6cadb43b991620f7d9e9baa06
-bin/icuin57.dll: 3f0eb9f4e2b0e4012afa16f83e9ff0dc
-bin/icutest57.dll: ff878466aa02fa1bddfb94ba17b246a8
-bin/icutu57.dll: fef065fefce5fc67ef4a43b666d147d0
-bin/icuuc57.dll: cc8db4d8a1ee20f4e8a46041ef06862f
-conaninfo.txt: 13f4fa914f5920b05e5b228be8679454
+1478097969
+bin/icudt57.dll: 87bbc24187330408f9d7cb056060e0ad
+bin/icuin57.dll: 10bcbdf7ce17871d7ac0fe560a58493e
+bin/icuuc57.dll: 2f252173e83d958205d83e168af27bd1
+conaninfo.txt: 93a147af5e69ef5fc1628b5f401d2e72
 include/unicode/alphaindex.h: e74fcba85b76577d32b90bc0056ee5d9
 include/unicode/appendable.h: 5c2d97a96252e2c959d4c226a554575b
 include/unicode/basictz.h: 444077f7dd19bd6dbe24034360356e8a
@@ -173,8 +171,6 @@ include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4
 include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1
 include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6
 include/unicode/vtzone.h: 90e065183436be0a94918465f66be863
-lib/icudt.lib: 6ca31dc410effd400636e14cbc616324
-lib/icuin.lib: d3a00a713d384bd66094e2270d98ad2d
-lib/icutest.lib: 4ee3e48e551b0f14c992cafd5f5565ba
-lib/icutu.lib: d3b931010519ec185efa3b41837f6a72
-lib/icuuc.lib: 209fc74475de9d7244b0780771a4d8ed
+lib/icudt.lib: 375f9aff64352ed211a704156f40b206
+lib/icuin.lib: 752c472eb6f90acde3372894a68e2291
+lib/icuuc.lib: 1f493156171786bf782d85ca6ae017bf

coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt

@@ -1,2 +1,2 @@
-1482493404
-conanfile.py: 4c879159bebcecec85173f085cd4c3c7
+1478189855
+conanfile.py: 2d514c8a822e7432b8d2e030c3d17693

coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt

@@ -1,6 +1,6 @@
-1482493099
-bin/libxml2.dll: f43264365ba9d2681455ff106303a4e9
-conaninfo.txt: b51d149c110dea2bef2ab37017308696
+1478189644
+bin/libxml2.dll: 622bde2aec1d514bbf4ffcdcd734dbb7
+conaninfo.txt: a27084d89e21b40687c65926b75cf057
 include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
 include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087
 include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
@@ -44,12 +44,13 @@ include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4
 include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53
 include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29
 include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41
+include/libxml/xmlwin32version.h: 0c672b45ad0bbc3285870375ac5e62c9
 include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3
 include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1
 include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
 include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
 include/win32config.h: 410df263529fb9ec616b22f590dbdd1d
 include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72
-lib/libxml2.lib: ec17f6714da6647f63d2cdc54d005e43
-lib/libxml2_a.lib: abae79bdfded67d5017604b7b7c8dd03
-lib/libxml2_a_dll.lib: f68e18d65520175beb3a8de99cbb7e9b
+lib/libxml2.lib: 61e2849cbb7376a17665994d68f7c9b4
+lib/libxml2_a.lib: c4bae1030473a5473ecc77cdf5af397d
+lib/libxml2_a_dll.lib: 98c11a0804ff364feb161bfa1214bc63

coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt

@@ -1,2 +1,2 @@
 1478438034
-conanfile.py: 2472a82109b2d59062d3e50a54d08a4a
+conanfile.py: 2472a82109b2d59062d3e50a54d08a4a

coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt

@@ -1,7 +1,7 @@
-1482494566
-bin/libexslt.dll: 656ebfef4dcd7d299bff8f5123bfd4b9
-bin/libxslt.dll: cdca16a3183ddcbdf3d0087c3f1e62e9
-conaninfo.txt: 73548fb3ff61aade734c0ce2071a2d05
+1478437844
+bin/libexslt.dll: f57633ce0800d9041ba0040d8fbc9734
+bin/libxslt.dll: 20016a1ea3bc1625cb28e807787d8c93
+conaninfo.txt: 49fd643454ba3c15665b78805623c650
 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717
 include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9
 include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809
@@ -32,7 +32,7 @@ include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000
 include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07
 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9
 include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001
-lib/libexslt.lib: a84716fa57d325856a55cf5ba8a816c6
-lib/libexslt_a.lib: c428937c93542c6386534b61239e8119
-lib/libxslt.lib: 43b2e966367546ff110762f24f4c919d
-lib/libxslt_a.lib: a802233763886894a7a89e4f8e634e6a
+lib/libexslt.lib: 424b0512b9a5c474e0f67bc6620b778a
+lib/libexslt_a.lib: ae779d86d57ce47bd3f088525126c98a
+lib/libxslt.lib: ca7513e26e38cb34f826eee424bafe8f
+lib/libxslt_a.lib: 5fcc830c7af32b7b328335b81ef81999

coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1

@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1

@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled

coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt

@@ -1,2 +1,2 @@
-1482492127
-conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3
+1478098249
+conanfile.py: f66225cf233d8eee6c6c6b4832d81b79

coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt

@@ -1,10 +1,8 @@
-1482492365
-bin/icudt57.dll: 9424922f2422576e81509aad8911629d
-bin/icuin57.dll: 731ea41a670e4913d4dbeb9cf2fb300d
-bin/icutest57.dll: 0103d75f36194e398d8b89c12a6fb6f3
-bin/icutu57.dll: a94d3824640e025353d025a3f50caf10
-bin/icuuc57.dll: 96ecbd9165898f291b3920609ade6096
-conaninfo.txt: 05bf80d930c44b525645a86d8fd1084d
+1478098455
+bin/icudt57.dll: 672be38b9176350208e62915e3d22bd7
+bin/icuin57.dll: e14d1d399efb686d4680073ae0452d59
+bin/icuuc57.dll: 9d47b44bd2a382509ffe67c52085467f
+conaninfo.txt: 58d139c57d36025b13c7691cc6fe02d6
 include/unicode/alphaindex.h: e74fcba85b76577d32b90bc0056ee5d9
 include/unicode/appendable.h: 5c2d97a96252e2c959d4c226a554575b
 include/unicode/basictz.h: 444077f7dd19bd6dbe24034360356e8a
@@ -173,8 +171,6 @@ include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4
 include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1
 include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6
 include/unicode/vtzone.h: 90e065183436be0a94918465f66be863
-lib/icudt.lib: cf92bb1d1fc1ffea58e7058134fd0f71
-lib/icuin.lib: eca7f889859a2078dba5ae0c228bb45f
-lib/icutest.lib: daf163f500ea14d3eafcb2e7885b5f2f
-lib/icutu.lib: 6236376ec549a1daba31f7b34cdbb957
-lib/icuuc.lib: f3cfefda92e691c3f81cae2ac3fdff14
+lib/icudt.lib: 8feb46831d7f9ff4f851ddb4a3b86287
+lib/icuin.lib: 27e6dd91a18fb61c4e92c5155efec652
+lib/icuuc.lib: cf6f30f41e57d2d7094b450d766a390a

coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt

@@ -1,2 +1,2 @@
-1482493404
-conanfile.py: 4c879159bebcecec85173f085cd4c3c7
+1478189855
+conanfile.py: 2d514c8a822e7432b8d2e030c3d17693

coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt

@@ -1,6 +1,6 @@
-1482493354
-bin/libxml2.dll: 0b02196ac933431b150fb73a5bed7518
-conaninfo.txt: 29ccd6acef148fd29fc8ebee20216618
+1478189807
+bin/libxml2.dll: b86b5aa939f258befbaca3cda811b371
+conaninfo.txt: 1542aee37a2d33374417a5a745c77d0f
 include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
 include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087
 include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
@@ -44,12 +44,13 @@ include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4
 include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53
 include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29
 include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41
+include/libxml/xmlwin32version.h: 0c672b45ad0bbc3285870375ac5e62c9
 include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3
 include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1
 include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
 include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
 include/win32config.h: 410df263529fb9ec616b22f590dbdd1d
 include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72
-lib/libxml2.lib: 7ab0a2cf0511ea7eb2593a24e5a31750
-lib/libxml2_a.lib: a4d10046b1cf6910811687a04ef38d6f
-lib/libxml2_a_dll.lib: f785611927ed7f3a9514a1ccac31fd10
+lib/libxml2.lib: 814daf6ff042d2110b047da877b075d7
+lib/libxml2_a.lib: c85b4ef8c9e404369a140134a450f98c
+lib/libxml2_a_dll.lib: 2cac7d585f12fef63dfbe20f470f2d5e

coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt

@@ -1,2 +1,2 @@
 1478438034
-conanfile.py: 2472a82109b2d59062d3e50a54d08a4a
+conanfile.py: 2472a82109b2d59062d3e50a54d08a4a

coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt

@@ -1,7 +1,7 @@
-1482494796
-bin/libexslt.dll: acf1f58607eb1a10534cc30ca2bf2c9f
-bin/libxslt.dll: 9edc15648704934221ec3afcedb25451
-conaninfo.txt: 224814c47f7d14968c401d2180974e77
+1478437988
+bin/libexslt.dll: bace70c121c29fd8b9e29ce7ea924367
+bin/libxslt.dll: 00022b72c0cacd3c3ca7bc48a0ec4632
+conaninfo.txt: cba36a71cb20255ea805a39e62e79070
 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717
 include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9
 include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809
@@ -32,7 +32,7 @@ include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000
 include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07
 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9
 include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001
-lib/libexslt.lib: 0c9f94aeea183a48ec62d6e1a3ac42af
-lib/libexslt_a.lib: 026a42ff0b36660c1bd4890b656c80ee
-lib/libxslt.lib: 084d078777bf34d52af7fc93a425d6b0
-lib/libxslt_a.lib: a07434cb5a40a32a17be58f71fe24976
+lib/libexslt.lib: c78e77d2bc7ce733a9d45f23176f2803
+lib/libexslt_a.lib: 29b31bece1e69641372cadce020326ad
+lib/libxslt.lib: b7d9260d0f7ada29f5d3649820a8e1cb
+lib/libxslt_a.lib: e24f546f9b757fd152de506c2d3af1bf

coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1

@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-7-x86/04-msys.ps1

@@ -1,14 +0,0 @@
-. "$PSScriptRoot\..\common\helpers.ps1"
-
-# This script will install msys which is needed for configuring openssl for Android
-
-$version = "1.0.11"
-$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z"
-
-$zip = "c:\users\qt\downloads\msys-$version.7z"
-$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
-$destination = "C:\msys"
-
-Download $url $url $zip
-Verify-Checksum $zip $sha1
-C:\Utils\sevenzip\7z.exe x $zip -oC:\

coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1

@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled

coin/provisioning/qtci-windows-7-x86/android_openssl.ps1

@@ -1,32 +0,0 @@
-. "$PSScriptRoot\..\common\helpers.ps1"
-
-# OpenSSL need to be configured from sources for Android build in windows 7
-# 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.2j"
-$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
-$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
-$destination = "C:\Utils\openssl-android-master"
-
-Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip
-Verify-Checksum $zip $sha1
-
-C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils
-C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils
-Remove-Item $destination -Force -Recurse
-Rename-Item C:\Utils\openssl-$version $destination
-Remove-Item $zip
-Remove-Item C:\Utils\openssl-$version.tar
-
-set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc
-set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar
-set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr
-$env:Path = $env:Path + ";C:\msys\1.0\bin"
-
-echo "Configuring OpenSSL $version for Android..."
-cd $destination
-C:\msys\1.0\bin\bash.exe -c "perl Configure shared android"
-
-# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
-# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h

coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1

@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1

@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled

coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1

@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1

@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled

configure.json

@@ -0,0 +1,7 @@
+{
+    "commandline": {
+        "options": {
+            "skip": "addString"
+        }
+    }
+}

qt.pro

@@ -1,12 +1,10 @@
 # Create the super cache so modules will add themselves to it.
 cache(, super)
 
-CONFIG += build_pass   # hack to disable the .qmake.super auto-add
-load(qt_build_config)
-CONFIG -= build_pass   # unhack, as it confuses Qt Creator
-
 TEMPLATE      = subdirs
 
+CONFIG += prepare_docs qt_docs_targets
+
 # Extract submodules from .gitmodules.
 lines = $$cat(.gitmodules, lines)
 for (line, lines) {
@@ -26,6 +24,29 @@ for (line, lines) {
 }
 QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules
 
+QT_SKIP_MODULES =
+uikit {
+    QT_SKIP_MODULES += qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples
+    !ios: QT_SKIP_MODULES += qtscript
+}
+
+# This is a bit hacky, but a proper implementation is not worth it.
+args = $$QMAKE_EXTRA_ARGS
+for (ever) {
+    isEmpty(args): break()
+    a = $$take_first(args)
+
+    equals(a, -skip) {
+        isEmpty(args): break()
+        m = $$take_first(args)
+        contains(m, -.*): next()
+        m ~= s/^(qt)?/qt/
+        !contains(modules, $$m): \
+            error("-skip command line argument used with non-existent module '$$m'.")
+        QT_SKIP_MODULES += $$m
+    }
+}
+
 modules = $$sort_depends(modules, module., .depends .recommends)
 modules = $$reverse(modules)
 for (mod, modules) {
@@ -72,3 +93,5 @@ for (mod, modules) {
 
     SUBDIRS += $$mod
 }
+
+load(qt_configure)