Update submodules on '5.11.0' in qt5

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

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.11
+	branch = 5.11.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.11
+	branch = 5.11.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.11
+	branch = 5.11.0
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.11
+	branch = 5.11.0
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.11
+	branch = 5.11.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.11
+	branch = 5.11.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.11
+	branch = 5.11.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,27 +121,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -154,51 +154,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.11
+	branch = 5.11.0
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -211,108 +211,108 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.11
+	branch = 5.11.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.11
+	branch = 5.11.0
 	status = preview
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.11
+	branch = 5.11.0
 	status = preview

coin/provisioning/common/shared/sw_versions.txt

@@ -1 +1 @@
-libclang_version="4.0"
+libclang_version="6.0"

coin/provisioning/common/unix/libclang.sh

@@ -41,6 +41,7 @@
 set -e
 
 source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../shared/sw_versions.txt
@@ -53,7 +54,7 @@ if [ $# -eq 0 ]
     echo "Using macOS defaults"
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
-    sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
+    sha1="10e48167b61726b20517172f8aff80fa1d9a379b"
 fi
 
 zip="libclang.7z"
@@ -68,3 +69,9 @@ sudo mv /tmp/libclang $destination
 
 echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
 echo "libClang = $version" >> ~/versions.txt
+
+if [ "$version" == "6.0" ]; then
+    # This is a hacked static build of libclang which requires special
+    # handling on the qdoc side.
+    SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1"
+fi

coin/provisioning/common/windows/libclang.ps1

@@ -1,6 +1,7 @@
 param(
     [Int32]$archVer=32,
-    [string]$toolchain="vs2015"
+    [string]$toolchain="vs2015",
+    [bool]$setDefault=$true
 )
 . "$PSScriptRoot\helpers.ps1"
 
@@ -11,20 +12,22 @@ param(
 
 Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
     $var = $_.Split('=')
-    New-Variable -Name $var[0] -Value $var[1]
+    New-Variable -Name $var[0] -Value $var[1] -Force
     $libclang_version = $libclang_version -replace '["."]'
 }
 
 $zip = "c:\users\qt\downloads\libclang.7z"
-$baseDestination = "C:\Utils\libclang-" + $libclang_version
+$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain
 
 function setURL() {
     $script:url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
 }
 
+$toolchainSuffix = ""
+
 if ( $toolchain -eq "vs2015" ) {
     if ( $archVer -eq 64 ) {
-        $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
+        $sha1 = "37afa18d243a50c05bee5c6e16b409ed526ec17a"
         $destination = $baseDestination + "-64"
 
         setURL
@@ -37,7 +40,7 @@ if ( $toolchain -eq "vs2015" ) {
     }
 
     $archVer=32
-    $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
+    $sha1 = "812b6089c6da99ced9ebebbd42923bd96590519d"
     $destination = $baseDestination + "-32"
 
     setURL
@@ -47,11 +50,12 @@ if ( $toolchain -eq "vs2015" ) {
     Extract-7Zip $zip C:\Utils\
     Rename-Item C:\Utils\libclang $destination
     Remove-Item -Force -Path $zip
+    $toolchainSuffix = "msvc"
 }
 
 if ( $toolchain -eq "mingw" ) {
     if ( $archVer -eq 64 ) {
-        $sha1 = "3e318f70a1e76c14365ced65f4fa7031bb730818"
+        $sha1 = "1233e6c008b90d89483df0291a597a0bac426d29"
         $destination = $baseDestination + "-64"
 
         setURL
@@ -64,7 +68,7 @@ if ( $toolchain -eq "mingw" ) {
     }
 
     $archVer=32
-    $sha1 = "a9973192a01a9c16976ed0cc6ef6dac3dbc4a2d3"
+    $sha1 = "2d6ceab0e1a05e2b19fe615c57b64d36977b4933"
     $destination = $baseDestination + "-32"
 
     setURL
@@ -74,7 +78,17 @@ if ( $toolchain -eq "mingw" ) {
     Extract-7Zip $zip C:\Utils\
     Rename-Item C:\Utils\libclang $destination
     Remove-Item -Force -Path $zip
+    $toolchainSuffix = "mingw"
 }
 
+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
+    # handling on the qdoc side.
+    Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"
+}

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

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-# shellcheck source=../common/shared/sw_versions.txt
-. "$BASEDIR/../common/shared/sw_versions.txt"
-VERSION=$libclang_version
-URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
-SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
-
-"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh

@@ -5,6 +5,6 @@ BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/shared/sw_versions.txt
 VERSION=$libclang_version
 URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
-SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
+SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0"
 
 $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh

@@ -4,6 +4,6 @@ BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/shared/sw_versions.txt
 VERSION=$libclang_version
 URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
-SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
+SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0"
 
 $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh

@@ -60,5 +60,8 @@ sudo zypper -nq install libxslt-devel
 sudo zypper -nq install gstreamer-devel
 sudo zypper -nq install gstreamer-plugins-base-devel
 
+# pulseaudio (qtmultimedia)
+sudo zypper -nq install libpulse-devel
+
 # cups
 sudo zypper -nq install cups-devel

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh

@@ -6,6 +6,6 @@ BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/shared/sw_versions.txt
 VERSION=$libclang_version
 URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
-SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
+SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0"
 
 $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

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

@@ -1 +1,3 @@
+# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2015

coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1

@@ -1 +1,3 @@
+# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2015