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>
2026-03-02 18:47:08 +08:00 · 2018-10-03 17:58:05 +00:00 · 2018-10-02 08:11:15 +00:00 · 2018-10-01 09:10:16 +00:00 · 2018-09-30 14:06:37 +00:00 · 2018-09-28 05:40:46 +00:00
59 changed files with 259 additions and 123 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/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,28 @@
-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.12-x86_64-8                                           Clang                       DebugAndRelease Release
+qtci-macos-10.13-x86_64                                             Clang                       Packaging 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       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,19 @@
+Template                    Target OS           Target arch Compiler    Features
+--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                                   Mingw73     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
+qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,20 +1,20 @@
-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                    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     Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64     Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64     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/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/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-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/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	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