Update submodules on '5.12' in qt5

Change-Id: I8e2e7811ac09b65cb81b45c4aa48bf4e57885c71 Reviewed-by: Liang Qi <liang.qi@qt.io>
2026-01-09 16:36:35 +08:00 · 2018-10-22 00:19:52 +00:00 · 2018-10-21 09:33:06 +00:00 · 2018-10-20 05:16:02 +00:00 · 2018-10-20 05:15:55 +00:00 · 2018-10-20 05:15:40 +00:00
80 changed files with 399 additions and 208 deletions
--- a/.commit-template
+++ b/.commit-template
@@ -9,7 +9,11 @@

 # ==[ Footers: Uncomment and edit where applicable ]===================|
 #
-# One task per entry. Remember space after colon.
+# 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:
 #Task-number: 
 #Coverity-Id: 
 #
--- a/.gitmodules
+++ b/.gitmodules
@@ -210,8 +210,8 @@
 	branch = 5.12
 	status = addon
 [submodule "qtwebengine"]
-	depends = qtquickcontrols qtwebchannel
-	recommends = qtlocation qttools
+	depends = qtdeclarative
+	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel
 	path = qtwebengine
 	url = ../qtwebengine.git
 	branch = 5.12
--- 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 8 spaces
-ConstructorInitializerIndentWidth: 8
+# Indent initializers by 4 spaces
+ConstructorInitializerIndentWidth: 4

 # Indent width for line continuations.
 ContinuationIndentWidth: 8
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,28 +1,27 @@
-Template                            Target OS           Target arch 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         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         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.12-x86_64-8                                           Clang       Packaging DebugAndRelease Release
-qtci-macos-10.13-x86_64                                             Clang       DebugAndRelease Release
-qtci-macos-10.12-x86_64-8                                           Clang       DeveloperBuild Release QtNamespace NoPch
-qtci-macos-10.12-x86_64-8                                           Clang       Release NoFramework DisableTests
-qtci-macos-10.13-x86_64             IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
-qtci-macos-10.13-x86_64             TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
-qtci-macos-10.13-x86_64             WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
-qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       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    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         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                         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
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -0,0 +1,21 @@
+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         MSVC2017                    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         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         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-macos-10.13-x86_64-2   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,20 +1,22 @@
-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                                        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         Clang       Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-3        Android_ANY         armv7       Mingw73     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64     Android_ANY         armv7       Clang       Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64     Android_ANY         x86         Clang       Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   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    Target Compiler Features
+--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10                       x86         MSVC2017                    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
--- a/coin/platform_configs/qtbase.txt
+++ b/coin/platform_configs/qtbase.txt
@@ -3,3 +3,5 @@ Template                          Target OS           Target arch Compiler    Fe
 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
+
--- 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="r25.2.5"
-toolsFile="tools_$toolsVersion-linux.zip"
-ndkVersion="r16b"
+toolsVersion="r26.1.1"
+toolsFile="sdk-tools-linux-4333796.zip"
+ndkVersion="r18b"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
-sdkBuildToolsVersion="25.0.2"
+sdkBuildToolsVersion="28.0.3"
 sdkApiLevel="android-21"

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

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -90,6 +90,9 @@ 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"
@@ -102,7 +105,12 @@ 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/disable-cracklib.sh
+++ b/coin/provisioning/common/linux/disable-cracklib.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+sudo chmod -x /etc/cron.daily/cracklib-runtime
+
--- a/coin/provisioning/common/linux/disable-mlocate.sh
+++ b/coin/provisioning/common/linux/disable-mlocate.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+sudo chmod -x /etc/cron.daily/mlocate*
--- a/coin/provisioning/common/linux/emsdk.sh
+++ b/coin/provisioning/common/linux/emsdk.sh
@@ -0,0 +1,78 @@
+#!/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/remove_update-manager.sh
+++ b/coin/provisioning/common/linux/remove_update-manager.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+sudo apt-get remove update-manager
--- a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
@@ -64,6 +64,9 @@ function InstallFromCompressedFileFromURL {
        "zip")
            unzip "$targetFile" -d "$targetDirectory"
        ;;
+        "xz")
+            tar -xf "$targetFile" --directory "$targetDirectory"
+        ;;
        *)
            exit 1
        ;;
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
@@ -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-ndk-r16b\toolchains\llvm\prebuilt\linux-x86_64\bin\clang"
-Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r16b\toolchains\llvm\prebuilt\linux-x86_64\bin\llvm-ar"
-Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r16b\platforms\android-18\arch-arm\usr"
+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"

 # 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) 2017 The Qt Company Ltd.
+## 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.
@@ -40,23 +40,24 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.

 # NDK
-$ndkVersion = "r16b"
+$ndkVersion = "r18b"
 $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 = "becaf3d445a4877ca1a9300a62f0934a4838c7fa"
-$ndkFolder = "c:\utils\android-ndk-$ndkVersion"
+$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803"
+$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
 $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"

 # SDK
-$sdkVersion = "r24.4.1"
+$toolsVersion = "26.1.1"
+$toolsFile = "sdk-tools-windows-4333796.zip"
 $sdkApi = "ANDROID_API_VERSION"
 $sdkApiLevel = "android-21"
-$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"
+$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"

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

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

-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"
+Write-Host "Installing Android NDK $nkdVersion"
 Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl
 Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder
 Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder

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

-# 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"
+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`" "
 }

-Write-Output "Android SDK tools= $sdkVersion" >> ~/versions.txt
+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 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
@@ -0,0 +1,13 @@
+# 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/jom.ps1
+++ b/coin/provisioning/common/windows/jom.ps1
@@ -1,11 +1,13 @@
 . "$PSScriptRoot\helpers.ps1"

-$zip = Get-DownloadLocation "jom_1_1_2.zip"
+$version = "1_1_2"
+$zip = Get-DownloadLocation "jom_$version.zip"

-Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip
+Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.ci.local/input/windows/jom_$version.zip $zip
 Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
 Extract-7Zip $zip C:\Utils\Jom

 Set-EnvironmentVariable "CI_JOM_PATH" "C:\Utils\Jom"

-Write-Output "Jom = 1.1.2" >> ~/versions.txt
+$version = $version.replace('_','.')
+Write-Output "Jom = $version" >> ~/versions.txt
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -6,6 +6,7 @@ param(
 . "$PSScriptRoot\helpers.ps1"

 $libclang_version="6.0"
+Write-Output "libClang = $libclang_version" >> ~/versions.txt

 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
 # The Clang library (C-bindings), version 3.9 or higher is required for building.
@@ -13,6 +14,7 @@ $libclang_version="6.0"
 # Starting from Qt 5.11 QDoc requires Clang to parse C++

 $baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain
+$libclang_version = $libclang_version -replace '["."]'

 function install() {

@@ -23,7 +25,6 @@ function install() {

    $zip = "c:\users\qt\downloads\libclang.7z"

-    $libclang_version = $libclang_version -replace '["."]'
    $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
    $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"

@@ -72,7 +73,6 @@ if ( $setDefault ) {
    Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
 }
 Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
-Write-Output "libClang = $libclang_version" >> ~/versions.txt

 if ( $libclang_version -eq "60" ) {
    # This is a hacked static build of libclang which requires special
--- a/coin/provisioning/common/windows/mesa_llvmpipe.ps1
+++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1
@@ -35,20 +35,21 @@
 $version = "11_2_2"
 $package = "C:\Windows\temp\opengl32sw.7z"
 $mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1"
-$mesaOpenglUrl_64 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z"
+$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version.7z"
+$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z"
 $mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
-$mesaOpenglUrl_32 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
+$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version.7z"
+$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"

 function Extract-Mesa
 {
    Param (
-        [string]$downloadUrl,
+        [string]$downloadUrlCache,
+        [string]$downloadUrlAlt,
        [string]$sha1,
        [string]$targetFolder
    )
-    Write-Host "Installing Mesa from $downloadUrl to $targetFolder"
-    Write-Host "Downloading $downloadUrl to $package"
-    Invoke-WebRequest -UseBasicParsing $downloadUrl -OutFile $package
+    Download $downloadUrlAlt $downloadUrlCache $package
    Verify-Checksum $package $sha1
    Extract-7Zip $package $targetFolder
    Write-Host "Removing $package"
@@ -56,10 +57,10 @@ function Extract-Mesa
 }

 if (Is64BitWinHost) {
-    Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\System32"
-    Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64"
+    Extract-Mesa $mesaOpenglUrl_64_cache $mesaOpenglUrl_64_alt $mesaOpenglSha1_64 "C:\Windows\System32"
+    Extract-Mesa $mesaOpenglUrl_32_cache $mesaOpenglUrl_32_alt $mesaOpenglSha1_32 "C:\Windows\SysWOW64"
 } else {
-    Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32"
+    Extract-Mesa $mesaOpenglUrl_32_cache $mesaOpenglUrl_32_alt $mesaOpenglSha1_32 "C:\Windows\system32"
 }

 Write-Output "Mesa llvmpipe = $version" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/disable-mlocate.sh
+"$BASEDIR/../common/linux/disable-mlocate.sh"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/disable-mlocate.sh
+"$BASEDIR/../common/linux/disable-mlocate.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../common/linux/disable-cracklib.sh
+source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/disable-mlocate.sh
+"$BASEDIR/../common/linux/disable-mlocate.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../common/linux/remove_update-manager.sh
+source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../common/linux/disable-cracklib.sh
+source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/disable-mlocate.sh
+"$BASEDIR/../common/linux/disable-mlocate.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../common/linux/remove_update-manager.sh
+source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh"
--- 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
@@ -161,6 +161,17 @@ 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"
@@ -171,10 +182,3 @@ pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/share

 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-18.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
@@ -44,6 +44,19 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai
    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)
@@ -145,12 +158,12 @@ installPackages+=(dkms)
 # Needed for qtspeech
 installPackages+=(libspeechd-dev)

-echo "Installing packages"
-waitLoop
-sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 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
--- 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
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash

 #############################################################################
 ##
--- 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
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash

 #############################################################################
 ##
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash

 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
@@ -33,25 +33,6 @@
 ##
 #############################################################################

-# This script installs QNX 7.
-
-targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20180801-macos.zip"
-folderName="qnx700"
-
-sudo mkdir -p "$targetFolder"
-
-echo "Extracting QNX 7"
-sudo unzip -q "$sourceFile" -d "$targetFolder"
-
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
-
-# Verify that we have last file in zip
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-    exit 1
-fi
-
-# Set env variables
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
-echo "QNX SDP = 7.0.0" >> ~/versions.txt
+set -ex

+source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh"
--- 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,3 +87,5 @@ 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.13-x86_64/05-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh
@@ -87,3 +87,5 @@ 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.13-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
@@ -50,4 +50,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"

-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.4.1.tar.gz 9.4.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.tar.gz 10.0.0
--- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
@@ -37,10 +37,10 @@ set -ex

 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"

-version="9.4.1"
+version="10.0.0"
 packageName="Command_Line_Tools_macOS_10.13_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/$packageName"
-sha1="efe51c11c2c99a5f1a98bbd3772dc3fa3ce78904"
+sha1="1d6abe29b8df6397c179b8e2ffbfd0293f1282b0"

 InstallCommandLineTools $url $url $sha1 $packageName $version

--- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
@@ -47,15 +47,15 @@ sdkTargetFolder="$targetFolder/sdk"

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

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

-toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659"
-ndkSha1="e51e615449b98c716cf912057e2682e75d55e2de"
+toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
+ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -73,6 +73,9 @@ 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.13-x86_64/55-signtools.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
@@ -62,13 +62,13 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
 # Login keychain
 sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
-loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt")
+{ loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt"); } 2> /dev/null
 loginKeychain=$keychains/login.keychain

 echo "Setting login.keychain as default keychain.."
 security default-keychain -s $loginKeychain*
 echo "Unlocking Login keychain with password.."
-security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*
+{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null

 echo "remove the "Lock after X minutes of inactivity" from login.keychain"
 security set-keychain-settings $loginKeychain
@@ -86,7 +86,7 @@ sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.c
 # Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
 sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
 unlockKeychain=$targetFolder/unlock-keychain.sh
-Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain
+{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null
 sudo chmod 755 "$unlockKeychain"

 # Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
@@ -104,27 +104,27 @@ open "$keychains/$devIDKeychain"

 sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
 Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
-DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
+{ DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null

 echo "Unlocking $devIDKeychain with password.."
-security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain
+{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
 security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain

 sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
-Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios
-iosPassword=$(<"$targetFolder/ios_password.txt")
+{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
+{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null

 iPhoneDeveloper="iosdevelopment.p12"
 shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
 echo "Importing $iPhoneDeveloper.."
-security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
+{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null

 iPhoneDistribution="iosdistribution.p12"
 shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
 echo "Importing $iPhoneDistribution.."
-security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
+{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null

 # Mobileprovision
 echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
--- a/coin/provisioning/qtci-windows-10-x86/85-disable_quickedit_powershell.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/85-disable_quickedit_powershell.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-quickedit.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/85-disable_quickedit_powershell.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/85-disable_quickedit_powershell.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-quickedit.ps1"
--- a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw
--- a/qt.pro
+++ b/qt.pro
@@ -1,7 +1,13 @@
 # Create the super cache so modules will add themselves to it.
-# Also suppress the license check on subsequent "visits". The first
-# visit will skip it anyway due to not having a compiler set up yet.
-cache(CONFIG, add super, $$list(QTDIR_build))
+cache(, super)
+
+# Suppress the license check on subsequent "visits". The first
+# visit will skip it anyway due to not having a compiler set up
+# yet. This cannot be added to the super cache, because that is
+# read before spec_pre.prf, which flushes CONFIG. This does not
+# affect submodules, as they come with a .qmake.conf. But that
+# one sets the flag via qt_build_config.prf anyway.
+!QTDIR_build: cache(CONFIG, add, $$list(QTDIR_build))

 TEMPLATE      = subdirs

--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	7d01b06b8f	Update submodules on '5.12' in qt5 Change-Id: I8e2e7811ac09b65cb81b45c4aa48bf4e57885c71 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-22 00:19:52 +00:00
Qt Submodule Update Bot	b621cfd505	Update submodules on '5.12' in qt5 Change-Id: Ie8e19006d5e007e732ca0f68d8128ac3dfc8f498 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-21 09:33:06 +00:00
Tony Sarajärvi	4667cfc432	Update Android NDK and SDK on macOS envs Task-number: QTQAINFRA-2244 Change-Id: I20994bc7a64edefda09da68c4beddde4dc9948aa Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-20 05:16:02 +00:00
Tony Sarajärvi	bc5e5baf55	Update Android NDK and SDK on Windows envs Task-number: QTBUG-47672 Change-Id: I3e6526b296f15927b90ab3310d91f8505b0228b3 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-10-20 05:15:55 +00:00
Tony Sarajärvi	97efaacb2b	Update Android NDK and SDK on Linux envs Task-number: QTBUG-47672 Task-number: QTQAINFRA-2298 Done-with: Liang Qi <liang.qi@qt.io> Change-Id: I42c87d8453423530173b826c09dc6eb4bf9ad5b8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-20 05:15:40 +00:00
Qt Submodule Update Bot	6de2d1d211	Update submodules on '5.12' in qt5 Change-Id: I09368e4171c76cc52110b7778491d512d0d43de1 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-19 08:27:29 +00:00
Joni Jäntti	c51cbddc90	Provisioning: Windows_7_x86: libclang libclang is required for qdoc. Task-number: QTBUG-69793 Change-Id: I60b54b4338ed6fd3bae99813e268816e063c648a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>	2018-10-18 11:07:43 +00:00
Joni Jäntti	7e40cd3a7f	Provisioning: macOS_10.13: Update Xcode and cmd line tools to 10.0.0 Xcode and command line tools version 10 have been released, we should start building our Qt releases with it, both for iOS and macOS. Installing Xcode 10.0.0 requires OS version update to 10.13.6. A new tier 1 image has been created with the updated OS and this change takes it into use. Task-number: QTQAINFRA-2274 Change-Id: Ida7df234ecfd356b2cb2545ae10cd501dc47197b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>	2018-10-18 10:59:34 +00:00
Oswald Buddenhagen	4c2fea3d5d	fix setting QTDIR_build for default_pre.prf adding it to the super cache makes no sense, as that's read before spec_pre.prf, which clears CONFIG. use the regular cache instead. submodules do not inherit that setting, and they don't need to as per comment. also, don't keep adding it to the cache - the cache() function doesn't check whether the added value is already present, so we need to do that manually. amends `31590c0b65`. Fixes: QTBUG-63452 Change-Id: I608559a80a7c772dbdaacfaaadb4fc268b442c39 Reviewed-by: Kai Koehne <kai.koehne@qt.io>	2018-10-18 10:59:31 +00:00
Qt Submodule Update Bot	4061156381	Update submodules on '5.12' in qt5 Change-Id: Ica33ddf6fa348ed65f7194127c80b6e539462e6a Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-18 10:59:28 +00:00
Michal Klocek	b365b3853e	Make quickcontrols1/2 and webchannel optional for webengine Fixes: QTBUG-70784 Change-Id: I845216123f7638afd69b39d5da8020a449ab40b8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>	2018-10-16 13:59:23 +00:00
Heikki Halmet	9573b78b56	Provisioning: Use /dev/null when dealing with passwords This will prevent passwords showing in provisioning logs. Task-number: QTQAINFRA-2261 Change-Id: I501fd3be64514c59a604c1116113eaf975208024 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-10-16 13:59:18 +00:00
Jani Heikkinen	0b1493a840	Add packaging feature for MSVC2017 32 bit build Task-number: QTBUG-63708 Change-Id: Ib7897c5daffa49b014c95db5a6db9d350fe1a5e8 Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2018-10-16 13:59:16 +00:00
Juha Karjalainen	0ac22704fa	Provisioning: Disable powershell quickedit Powershell quickedit causes powershell window freeze until quickedit mode is exited by pressing enter. For some reason quickedit mode get's activated during build. This causes time out as agent does not get any output from processes. Task-number: QTQAINFRA-2263 Change-Id: I2878cc7a39bae504f826c5622cc5817fd227d7f0 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2018-10-13 08:41:42 +00:00
Qt Submodule Update Bot	af7dd645c8	Update submodules on '5.12' in qt5 Change-Id: I93231f063bc3c3d29add8ade27803c8f87572dde Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-13 08:41:33 +00:00
Andy Nichols	80aa7d0018	Update qt3d-runtime platform_configs Change-Id: I52ad38289e6a4b385a981bcf91933378651eafe7 Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2018-10-10 11:26:02 +00:00
Qt Submodule Update Bot	ab670f1967	Update submodules on '5.12' in qt5 Change-Id: If26ce4b6686cf5a704c9d64298a23159780a39e0 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-10 04:01:57 +00:00
Tony Sarajärvi	61c4be2c0b	Add Android arm64 targets Task-number: QTQAINFRA-2078 Change-Id: Icbc4fa27932e2a53d43bf1c72ddd2091f2801e5c Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2018-10-08 18:21:50 +00:00
Qt Submodule Update Bot	245815a620	Update submodules on '5.12' in qt5 Change-Id: Ibe3ea201ddcb9c555d458296e0f12fcc03fcf0e2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-10-07 08:19:45 +00:00
Joni Jäntti	7b9c3ced84	Provisioning: Ubuntu_16.04_x64: Use internal mirror Currently the internal package mirroring is being enabled only after the installation of the packages. It should be done before to actually download them from the internal repo instead of the official repos. Change-Id: I4aeb2e463ae804bd2f8ce9536ab89fc26fedbdb5 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2018-10-05 12:04:46 +00:00
Joni Jäntti	ca36d5b3fa	Provisioning: Ubuntu 18.04: Use internal package mirror Using internal package mirror during provisioning reduces outgoing web traffic by a huge amount. Task-number: QTQAINFRA-2213 Change-Id: I6a63b51efbf411a712795a6347c2deeed6ac44d3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-10-04 10:08:47 +00:00
Tony Sarajärvi	e85296ba98	Optimize macOS build targets by removing excess builds Change-Id: I983f7558dabddf7e91f855dbead6dc0172db127c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>	2018-10-04 08:03:27 +00:00
Qt Submodule Update Bot	260d66f94e	Update submodules on '5.12' in qt5 Updated qtwebengine once againt to have a fix for getting beta1 out Change-Id: I3de7ad0916e886722186f09da036ea7a398f363f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-10-03 17:58:05 +00:00
Qt Submodule Update Bot	bc7af0171f	Update submodules on '5.12' in qt5 Change-Id: Idb32934a75413896c3a1ea64cd0a69a42d75e9f5 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-02 08:11:15 +00:00
Qt Submodule Update Bot	269e38c27c	Update submodules on '5.12' in qt5 Change-Id: I1705b1d1b99f4a547bcd6c0c7d17a65f61aea44a Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-01 09:10:16 +00:00
Qt Submodule Update Bot	74ab43ba23	Update submodules on '5.12' in qt5 Change-Id: Ib44fb3e8fa52ff72bbe7f92630635a5158a02ed2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-09-30 14:06:37 +00:00
Liang Qi	d58cfd0db9	Update submodules on '5.12' in qt5 Skip qtbase in this round. Change-Id: Ia649f87c2bc71d9e755b665ef9bc86e2f63f8d0d Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-28 05:40:46 +00:00
Tony Sarajärvi	f35067c7c3	Set timezone to GMT in macOS'es macOS doesn't support UTC, so we'll go with GMT. Task-number: QTQAINFRA-1641 Change-Id: Ifae9547b010c293c4a2cb18252e8f18961a4456a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>	2018-09-27 18:09:38 +00:00
Liang Qi	7520be78cf	Update submodules on '5.12' in qt5 Exclude qtwebengine in this round. Change-Id: Iccbd8d5f4f4c016eab24f8b969aa485bb59a1d62 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-26 04:28:05 +00:00
Tony Sarajärvi	a620807118	Move QNX770 from macOS 10.12 to macOS 10.13 Change-Id: I02f0fff983349dd59f2697a050b97b761d04d3b5 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-09-24 17:13:22 +00:00
Tony Sarajärvi	f1256e1f39	Switch MinGW to clang in Windows Android builds Also as target_compiler is a column now, let's add the missing information about android target compiler in the rest of the configurations as well. Task-number: QTQAINFRA-1682 Change-Id: I6de1ea40383512f5fb8b55242f1a1ac264f9d7d6 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-09-21 16:33:36 +00:00
Tony Sarajärvi	00958e9430	Move packaging from macOS 10.12 to macos 10.13 Task-number: QTQAINFRA-2056 Change-Id: I04b0a282beedce15959b416d716b63bd6197b4a3 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-19 08:18:21 +00:00
Qt Submodule Update Bot	713ed0c9b8	Update submodules on '5.12' in qt5 Change-Id: Ib09d0026a9427134822303cd05e7f696a5d15a28 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-17 13:04:44 +00:00
Qt Submodule Update Bot	e59a97be63	Update submodules on '5.12' in qt5 Change-Id: I4f74142bd95c043968a80b75ff4a8d69207595dc Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-16 07:54:56 +00:00
Heikki Halmet	0e0d99d617	Provisioning: Support for Webassembly This change will install specified packages of Emscripten and set up the build environment for making binary artifacts of WebAssembly Task-number: QTQAINFRA-1972 Change-Id: Ia5df6c208ea8f29ca8948f0273f321a59fc694a2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>	2018-09-15 10:06:47 +00:00
Tony Sarajärvi	c51c0a2b2e	Fix shebang on QNX provisioning scripts for Ubuntu 18.04 Change-Id: I74393c3d0382daae9bd1e82a495be19ad2baf90e Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2018-09-15 10:06:43 +00:00
Qt Submodule Update Bot	d25341093a	Update submodules on '5.12' in qt5 Change-Id: Ib41f214459b3e5dfc5f509871facc6c2212237ed Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-15 10:06:40 +00:00
Liang Qi	dada6497fb	Merge remote-tracking branch 'origin/5.11' into 5.12 Change-Id: Iac3eb41931081588a08916ddce51dae977c6ef15	2018-09-12 21:50:27 +02:00
Liang Qi	e866953948	Merge remote-tracking branch 'origin/5.11.2' into 5.11 Conflicts: coin/platform_configs/qt5.txt Change-Id: I430b2b99d1ed463d1750c6f1a5955bc0742f4b35	2018-09-10 10:12:36 +02:00
Qt Submodule Update Bot	e95824f59e	Update submodules on '5.11' in qt5 Change-Id: I15c5af9f1985ad113fd63c3366bd7f4d8612e4af Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-10 07:38:43 +00:00
Qt Submodule Update Bot	bf0b84a051	Update submodules on '5.11' in qt5 Change-Id: Ie1bf232eae589efe512178d158aef2f3c09a2b7c Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-07 05:30:18 +00:00
Antti Kokko	6a919fb8f5	Use MinGW73 for building Qt3D runtime QNX targets Change-Id: I0fc650345dcffe8840f440db74cf4d9d48465bf9 Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>	2018-09-06 11:41:52 +00:00
Qt Submodule Update Bot	daae11c62b	Update submodules on '5.11.2' in qt5 Change-Id: If0f3dc30be6ad8e10d81c0b8861c9523a07c0894 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-09-06 11:41:48 +00:00
Qt Submodule Update Bot	040ca5e267	Update submodules on '5.11.2' in qt5 Change-Id: If055dba4544826db368e5d46bb8d6b622e08d892 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-05 04:40:45 +00:00
Qt Submodule Update Bot	72505cc55b	Update submodules on '5.11' in qt5 Change-Id: I35ae3d03cfa8f5dd202218ffb7d2f0057eb41660 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-09-04 21:30:42 +00:00
Qt Submodule Update Bot	b9b8066d97	Update submodules on '5.11' in qt5 Change-Id: I89b673b1078c0ffab7e4710b2718008c46127bad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-09-04 08:45:49 +00:00
Liang Qi	c478262c26	Update submodules on '5.11.2' in qt5 Change-Id: Iebe3db08c265da0185b58c67aeae3765f8eb5616 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-03 19:38:40 +00:00
Heikki Halmet	c870b9b13f	Provisioning: Disable mlocate from linux No need to update the locate database Task-number: QTQAINFRA-2099 Change-Id: Iae8bf26e4b04ff9c287e9e3f4cc6f492e74355e4 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-09-03 19:38:37 +00:00
Heikki Halmet	967129344a	Provisioning: Remove update-manager Task-number: QTQAINFRA-2104 Change-Id: Ieaf0801099d8c90821c2b8d9db7da47730fd8abb Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-09-03 19:38:34 +00:00
Heikki Halmet	cd9b6276b8	Provisioning: Disable Cracklib-runtime Task-number: QTQAINFRA-2104 Change-Id: I784fa1b3d8c98d765bfdea929fdb494ca63e09d3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-09-03 19:38:32 +00:00
Frederik Gladhorn	8b4d267af7	Add Fixes: tag to commit template Change-Id: I2ad6829901be73bd18a8785c2bee3acd3ba20bcc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>	2018-08-31 08:35:56 +00:00
Frederik Gladhorn	5872e22f31	_clang-format: indent initializers with four spaces, not eight Change-Id: I9fc644554bd326a3a54163072b7b9e06253a5ff2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>	2018-08-30 09:09:28 +00:00
Antti Kokko	f70c304b5e	Add qt3d-runtime targets Task-number: QT3DS-2126 Change-Id: Ibce83cbd513bc0083ac149ed453fc9eb217c1d7a Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>	2018-08-30 08:35:36 +00:00
Frederik Gladhorn	b54ad48585	Merge remote-tracking branch 'origin/5.11' into 5.11.2 Change-Id: I376800d8d095d483bbf5342d90fc5e013415e59a	2018-08-27 15:54:13 +02:00
Heikki Halmet	a2289e9b4e	Provisioning: Change mesa_llvmpipe to use ci-files01-hki as primary url This will reduce download time Task-number: QTQAINFRA-2170 Change-Id: I8313764f7d440e2300a8efabfe4e4226a591d339 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-08-25 07:09:14 +00:00
Heikki Halmet	32fcfb08ce	Provisioning: Change jom to use ci-files01-hki as primary url This will reduce download time Task-number: QTQAINFRA-2169 Change-Id: If36ac57daa7066cdd97d5d893a105b812e0eee18 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-08-25 07:09:11 +00:00
Qt Submodule Update Bot	6945c8487c	Update submodules on '5.11.2' in qt5 Change-Id: I63679cff0e7469b9483e521dfa5f59d355e6562e Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-08-25 07:09:07 +00:00
Simon Hausmann	cdb1230145	Manual update of just qttools to pull in libclang build fix Task-number: QTBUG-69793 Change-Id: I9852567a5268be62b45f605bc0e7a0248278c931 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2018-08-23 09:28:59 +00:00
Simon Hausmann	1e9fb7f9d9	Prospective fix for build of qttools on Windows with QNX target This modules contains qdoc as a host build tool, which needs to be built with MinGW 7.3 as host compiler in order for the libclang linkage to succeed. That linkage is forced via QDOC_USE_STATIC_LIBCLANG, which is set on the Windows 10 machine. Task-number: QTBUG-69793 Change-Id: I2f0ce81c58ae049d9d59559dfe4f457d082cc98d Reviewed-by: Simo Fält <simo.falt@qt.io>	2018-08-23 09:28:56 +00:00
Heikki Halmet	3dd549d618	Provisioning: Fix activate of static linking for libclang Task-number: QTBUG-69793 Change-Id: Ib5151e16d0e040a63a3f7fce054f2fad6abb2b6d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-08-23 09:28:51 +00:00
Qt Submodule Update Bot	6c225347aa	Update submodules on '5.11.2' in qt5 Change-Id: I34da23765b048c8e3348d6ac05b18598bfefcd83 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-08-20 16:16:31 +00:00
Oswald Buddenhagen	e49e7fc8ad	Adjust submodule branches Change-Id: Ie460cb41d050c1b73e71278469a8231e294db3e3	2018-08-17 16:03:52 +02:00
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\windows\disable-quickedit.ps1"`
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw`