Update submodules on '5.11.0' in qt5

Change-Id: I73fe6947d8ffdf56ea77e9aab5eb89955a0eed2f Reviewed-by: Liang Qi <liang.qi@qt.io>
2025-12-21 15:38:15 +08:00 · 2018-05-04 18:21:18 +00:00 · 2018-05-03 15:42:55 +00:00 · 2018-05-01 06:34:05 +00:00 · 2018-04-28 16:22:40 +00:00 · 2018-04-28 11:59:13 +00:00
48 changed files with 105 additions and 102 deletions
--- a/.gitmodules
+++ b/.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
--- a/coin/provisioning/common/shared/sw_versions.txt
+++ b/coin/provisioning/common/shared/sw_versions.txt
@@ -1 +1 @@
-libclang_version="4.0"
+libclang_version="6.0"
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -53,7 +53,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"
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/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,11 @@ if ( $toolchain -eq "mingw" ) {
    Extract-7Zip $zip C:\Utils\
    Rename-Item C:\Utils\libclang $destination
    Remove-Item -Force -Path $zip
+    $toolchainSuffix = "mingw"
 }

-Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
+if ( $setDefault ) {
+    Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
+}
+Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
 Write-Output "libClang = $libclang_version" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh
+++ b/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"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
+++ b/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"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh
+++ b/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"
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh
+++ b/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
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh
+++ b/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"
--- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
+++ b/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
--- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
+++ b/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
--- 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	8cd324b216	Update submodules on '5.11.0' in qt5 Change-Id: I73fe6947d8ffdf56ea77e9aab5eb89955a0eed2f Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-05-04 18:21:18 +00:00
Qt Submodule Update Bot	ab7772a73d	Update submodules on '5.11.0' in qt5 Change-Id: I37be73eba9442b56b5f7147e7d69b98ce464b44d Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-05-03 15:42:55 +00:00
Simon Hausmann	41369b6282	Install the MinGW build of libclang This restores the MinGW installation of libclang on Windows 7 and installs the MSVC and MinGW builds in parallel on Windows 10. For compatibility reasons the MSVC installation is done last, to ensure that the older LLVM_INSTALL_DIR variable points to the MSVC installation. In addition though we now get LLVM_INSTALL_DIR_MINGW and LLVM_INSTALL_DIR_MSVC, which qt_find_clang.prf in qttools can use in the future. Task-number: QTBUG-66015 Change-Id: I8b53b85d0cde597c88a089f2a05f03947828d9bd Reviewed-by: Simo Fält <simo.falt@qt.io>	2018-05-01 06:34:05 +00:00
Qt Submodule Update Bot	d14d8f0cac	Update submodules on '5.11.0' in qt5 Change-Id: If2f1f76270195f337803ba302e46049acb015e3c Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-04-28 16:22:40 +00:00
Qt Submodule Update Bot	5cc5f606a9	Update submodules on '5.11.0' in qt5 Change-Id: Ica9fca497f78dd4660118814acce3a4c2c0e68b7 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-04-28 11:59:13 +00:00
Jędrzej Nowacki	c5ddbdb86b	Update clang version to 6.0 The version also contains statically compiled libraries so we can ship qdoc without shipping libclang. The change temporarly removes CI qdoc builds from RHEL6 and MinGW, these two configurations are not used for packaging, just for CI testing. We should restore MinGW later. Task-number: QTBUG-66015 Task-number: QTBUG-67764 Change-Id: Ie37b4be6a639e81d9ef0815682c6d60981cbeaae Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Fredrik de Vibe <fredrik.devibe@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2018-04-28 11:59:06 +00:00
Qt Submodule Update Bot	0e870f5594	Update submodules on '5.11.0' in qt5 Change-Id: I16b8e45bd4dff9470299aced9fdf5302878f61f8 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-04-24 19:43:11 +00:00
Liang Qi	38e6ddc9ee	Merge remote-tracking branch 'origin/5.11' into 5.11.0 Change-Id: Ida278c6731466e7de8c9dc9115a948488869a746	2018-04-20 15:29:36 +02:00
Qt Submodule Update Bot	2671e05023	Update submodules on '5.11.0' in qt5 Change-Id: Ie95476e1e3f240b8a55da79b09c65736f240272e Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-04-18 17:16:53 +00:00
Topi Reinio	795981e720	Provisioning: openSUSE-42.3: Install libpulse-devel Required by Qt Multimedia. Task-number: QTBUG-64538 Change-Id: I12e5a1b1a6390f553d883ce12647475eb9dd2992 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-04-17 16:43:53 +00:00
Liang Qi	4d4159f7b7	Merge remote-tracking branch 'origin/5.11' into 5.11.0 Change-Id: Id0540cee408413b7f5ab7410f3d1db3f38fd46af	2018-04-17 14:15:23 +02:00
Oswald Buddenhagen	24e1a15d40	Adjust submodule branches Change-Id: Ic069e5dedce639cb1c17df06ee43e87eacc139d8	2018-04-12 14:07:13 +02:00