Update FFmpeg => 7.1.5

The FFmpeg update fixes critical magicyuv decoder vulnerabilities. Change-Id: Ie18d42f4fa7c0b9e975a017dd6f20419036a106e Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
Update submodules on '6.11.2 in qt/qt5'
2026-09-18 22:59:58 +08:00 · 2026-08-13 05:27:40 +00:00 · 2026-08-13 05:27:39 +00:00 · 2026-08-13 05:27:38 +00:00 · 2026-08-04 04:54:12 +00:00 · 2026-08-03 08:26:30 +03:00
52 changed files with 101 additions and 101 deletions
@@ -1,46 +1,46 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -48,7 +48,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -61,7 +61,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -69,82 +69,82 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtconnectivity"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.11
+	branch = 6.11.2
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 	priority = 10
 [submodule "qtwebview"]
@@ -152,160 +152,160 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.11
+	branch = 6.11.2
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.11
+	branch = 6.11.2
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.11
+	branch = 6.11.2
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 download_ffmpeg() {
-    local version="${1:-"n7.1.3"}"
-    local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}"
+    local version="${1:-"n7.1.5"}"
+    local sha1="${2:-2322a4cef2d607c7f0048953662ec5e27c587ae8}"

    local ffmpeg_name="FFmpeg-$version"
    local target_dir="$HOME"
@@ -7,9 +7,9 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"

-$version="n7.1.3"
+$version="n7.1.5"
 $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-$sha1="27051817deec88bed3b9652d49f9127d22268d83"
+$sha1="2322a4cef2d607c7f0048953662ec5e27c587ae8"
 $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 $ffmpeg_name="FFmpeg-$version"

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 The Qt Company Ltd
+#Copyright (C) 2026 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 set -ex

 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/libclang-dyn.sh
-"$BASEDIR/../common/unix/libclang-dyn.sh"
+"$BASEDIR/../common/unix/libclang-dyn.sh" "-snld20"
@@ -5,4 +5,4 @@ set -ex

 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/libclang.sh
-"$BASEDIR/../common/unix/libclang.sh"
+"$BASEDIR/../common/unix/libclang.sh" "-snld20"
@@ -23,7 +23,7 @@ echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"

 targetFile=$(mktemp)
 DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile"
-sudo 7z x -y -o/usr/lib64 "$targetFile"
+sudo 7z x -snld20 -y -o/usr/lib64 "$targetFile"
 sudo rm "$targetFile"

 echo "Installing custom ICU devel packages on RHEL"
@@ -32,7 +32,7 @@ tempDir=$(mktemp -d)

 targetFile=$(mktemp)
 DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile"
-7z x -y -o"$tempDir" "$targetFile"
+7z x -snld20 -y -o"$tempDir" "$targetFile"

 sudo cp -a "$tempDir"/lib/* /usr/lib64
 sudo cp -a "$tempDir"/* /usr/
Author	SHA1	Message	Date
Artem Dyomin	713a365369	Update FFmpeg => 7.1.5 The FFmpeg update fixes critical magicyuv decoder vulnerabilities. Change-Id: Ie18d42f4fa7c0b9e975a017dd6f20419036a106e Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>	2026-08-13 05:27:40 +00:00
Qt Submodule Update Bot	8a50732918	Update submodules on '6.11.2 in qt/qt5' Change-Id: Ib71d72f9709839b2185036d8ff552a86e45b2800 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-08-13 05:27:39 +00:00
Simo Fält	fe897cd2bc	Provisioning: Fix 7z extract commands on RHEL 9.6 More recent 7z requires additional switch due to multi hop links. Change-Id: Ia023bf8d662d4c842acc97498e0b89cf2a2a167d Reviewed-by: Matti Paaso <matti.paaso@qt.io> (cherry picked from commit `dd13fa7b41`) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2026-08-13 05:27:38 +00:00
Qt Submodule Update Bot	f041bdc03d	Update submodules on '6.11.2 in qt/qt5' Change-Id: I382d193eec255f75ddda1e638fe17cb135326788 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-08-04 04:54:12 +00:00
Jani Heikkinen	f0534341c8	Adjust submodule branches Change-Id: I5c4813fe081a415425f7edf19914e19be91d5ac8	2026-08-03 08:26:30 +03:00