Update submodules on '5.12' in qt5

Change-Id: I8e2e7811ac09b65cb81b45c4aa48bf4e57885c71
Reviewed-by: Liang Qi <liang.qi@qt.io>

.gitmodules

@@ -210,8 +210,8 @@
 	branch = 5.12
 	status = addon
 [submodule "qtwebengine"]
-	depends = qtquickcontrols qtwebchannel
+	depends = qtdeclarative
-	recommends = qtlocation qttools
+	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel
 	path = qtwebengine
 	url = ../qtwebengine.git
 	branch = 5.12

coin/platform_configs/default.txt

@@ -13,14 +13,13 @@ qtci-linux-Ubuntu-18.04-x86_64                                      GCC
 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-2                                           Clang                       Packaging DebugAndRelease Release
-qtci-macos-10.13-x86_64                                             Clang                       Packaging DebugAndRelease Release
+qtci-macos-10.12-x86_64-8                                           Clang                       DeveloperBuild NoFramework Release QtNamespace NoPch
-qtci-macos-10.12-x86_64-8                                           Clang                       DeveloperBuild Release QtNamespace NoPch
+qtci-macos-10.13-x86_64-2           IOS_ANY             multi       Clang                       Packaging DebugAndRelease DisableTests Static
-qtci-macos-10.12-x86_64-8                                           Clang                       Release NoFramework DisableTests
+qtci-macos-10.13-x86_64-2           TvOS_ANY            multi       Clang                       DebugAndRelease DisableTests
-qtci-macos-10.13-x86_64             IOS_ANY             multi       Clang                       Packaging DebugAndRelease DisableTests Static
+qtci-macos-10.13-x86_64-2           WatchOS_ANY         multi       Clang                       DebugAndRelease DisableTests
-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-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

coin/platform_configs/qt3d-runtime.txt

@@ -1,19 +1,21 @@
-Template                    Target OS           Target arch Compiler    Features
+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   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-10-x86_64-10                       x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                                   Mingw73     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-7-x86-3                                        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                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
+qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73     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             armv8       Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   IOS_ANY             multi       Clang                       Packaging DebugAndRelease DisableTests Static
-qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+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

coin/platform_configs/qt5.txt

@@ -1,7 +1,7 @@
 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                       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
@@ -9,10 +9,12 @@ qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017
 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     Android_ANY         armv7       Clang       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     Android_ANY         x86         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     QNX_700             x86         GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
+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

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"
+toolsVersion="r26.1.1"
-toolsFile="tools_$toolsVersion-linux.zip"
+toolsFile="sdk-tools-linux-4333796.zip"
-ndkVersion="r16b"
+ndkVersion="r18b"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
-sdkBuildToolsVersion="25.0.2"
+sdkBuildToolsVersion="28.0.3"
 sdkApiLevel="android-21"
 
-toolsSha1="72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"
+toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
-ndkSha1="42aa43aae89a50d1c66c3f9fdecd676936da6128"
+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

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 "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang"
-Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r16b\toolchains\llvm\prebuilt\linux-x86_64\bin\llvm-ar"
+Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar"
-Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r16b\platforms\android-18\arch-arm\usr"
+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"

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"
+$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803"
-$ndkFolder = "c:\utils\android-ndk-$ndkVersion"
+$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"
+$sdkBuildToolsVersion = "28.0.3"
-$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\android-sdk_$sdkVersion-windows.zip"
+$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
-$sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip"
+$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
-$sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49"
+$toolsChecksum = "aa298b5346ee0d63940d13609fe6bec621384510"
-$sdkFolder = "c:\utils\android-sdk-windows"
+$toolsFolder = "c:\Utils\Android\tools"
-$sdkZip = "c:\Windows\Temp\android_sdk_$sdkVersion.zip"
+$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 "Installing Android NDK $nkdVersion"
-    Write-Host "Running Android SDK update for $1..."
-    cmd /c "echo y |$1\tools\android update sdk --no-ui --all --filter $2"
-}
-
-Write-Host "Installing Android ndk $nkdVersion"
 Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl
 Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder
 Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder
 
-#Write-Host "Installing Android sdk $sdkVersion"
+Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl
-Install $sdkCachedUrl $sdkZip $sdkChecksum $sdkOfficialUrl
+Set-EnvironmentVariable "ANDROID_SDK_HOME" C:\Utils\Android
-Set-EnvironmentVariable "ANDROID_SDK_HOME" $sdkFolder
 Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel
 
-# SDK update
+if (IsProxyEnabled) {
-SdkUpdate $sdkFolder $sdkApiLevel
+    $proxy = Get-Proxy
-SdkUpdate $sdkFolder tools
+    Write-Host "Using proxy ($proxy) with sdkmanager"
-SdkUpdate $sdkFolder platform-tools
+    # Remove "http://" from the beginning
-SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion
+    $proxy = $proxy.Remove(0,7)
-
+    $proxyhost,$proxyport = $proxy.split(':')
-# kill adb. This process prevents provisioning to continue
+    $sdkmanager_args = "--no_https --proxy=http --proxy_host=`"$proxyhost`" --proxy_port=`"$proxyport`" "
-$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"
 }
 
-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
-

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"

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

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

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

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
 

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"
+toolsVersion="r26.1.1"
-toolsFile="tools_$toolsVersion-macosx.zip"
+toolsFile="sdk-tools-darwin-4333796.zip"
-ndkVersion="r16b"
+ndkVersion="r18b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="25.0.2"
+sdkBuildToolsVersion="28.0.3"
 sdkApiLevel="android-21"
 
-toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659"
+toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
-ndkSha1="e51e615449b98c716cf912057e2682e75d55e2de"
+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"

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

coin/provisioning/qtci-windows-10-x86/85-disable_quickedit_powershell.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-quickedit.ps1"

coin/provisioning/qtci-windows-10-x86_64/85-disable_quickedit_powershell.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-quickedit.ps1"

coin/provisioning/qtci-windows-7-x86/08-libclang.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw

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
+cache(, super)
-# visit will skip it anyway due to not having a compiler set up yet.
+
-cache(CONFIG, add super, $$list(QTDIR_build))
+# 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