Update submodules on '6.9.0 in qt/qt5'

Change-Id: I415ed63f140d327bd070b0269ee78021b164a369 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-26 01:46:20 +08:00 · 2025-03-29 12:28:01 +00:00 · 2025-03-26 15:44:37 +00:00 · 2025-03-26 03:15:16 +00:00 · 2025-03-25 09:47:58 +00:00 · 2025-03-19 19:22:12 +00:00
46 changed files with 100 additions and 87 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.9
+	branch = 6.9.0
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.9
+	branch = 6.9.0
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.9
+	branch = 6.9.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.9
+	branch = 6.9.0
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -299,7 +299,19 @@ Configurations:
        'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
    ]
-
+-
+    Id: 'bookworm-gles-arm64-debian-pkg-packaging'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
+    Environment variables: [
+        'DEBIAN_RULES_REF=6.9_gles',
+        'COIN_TARGET_DIST=tqtc-bookworm',
+        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
+        'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
+        'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
+        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
+    ]
 -
    # This configuration runs for every submodule, using externally
    # built qdoc and qattributionscanner binaries, to ensure that no
--- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh
@@ -19,6 +19,7 @@ ffmpeg_name="FFmpeg-$version"
 target_dir="$HOME"
 ffmpeg_source_dir="$target_dir/$ffmpeg_name"
 prefix="/usr/local/ios/ffmpeg"
+dylib_regex="^@rpath/.*\.dylib$"

 if [ ! -d "$ffmpeg_source_dir" ];
 then
--- 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
--- 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	3f15b58b95	Update submodules on '6.9.0 in qt/qt5' Change-Id: I415ed63f140d327bd070b0269ee78021b164a369 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-29 12:28:01 +00:00
Qt Submodule Update Bot	ef04df88c2	Update submodules on '6.9.0 in qt/qt5' Change-Id: I9ffa181fd4549747d6df5e5ef45fcf2e43eecac0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-26 15:44:37 +00:00
Qt Submodule Update Bot	0e695e8124	Update submodules on '6.9.0 in qt/qt5' Change-Id: I7c2a08436bad63a199b673db35a9b8e92998f81e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-26 03:15:16 +00:00
Qt Submodule Update Bot	609ddf230a	Update submodules on '6.9.0 in qt/qt5' Change-Id: I143575ead1a8b4fbf0317c987d50f894aea0dd63 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-25 09:47:58 +00:00
Qt Submodule Update Bot	eda8e5dd0d	Update submodules on '6.9.0 in qt/qt5' Change-Id: Id3c5707bf166f2e1052e46fe6f9f92b4c7a45d36 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-19 19:22:12 +00:00
Qt Submodule Update Bot	21128d2ef1	Update submodules on '6.9.0 in qt/qt5' Change-Id: Iee3622d6169f4720f71933fd9981d0b33103460c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-18 14:32:17 +00:00
Qt Submodule Update Bot	427041f885	Update submodules on '6.9.0 in qt/qt5' Change-Id: Iec886e87f8ac6219cbba1a192a709ff453b4e088 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-17 14:49:39 +00:00
Qt Submodule Update Bot	9f04337921	Update submodules on '6.9.0 in qt/qt5' Change-Id: I24232ff1dacc8795421e240abc847e95df487878 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-16 01:53:37 +00:00
Qt Submodule Update Bot	4490f928ea	Update submodules on '6.9.0 in qt/qt5' Change-Id: I9c66c19a31fbcbd766e755e730a9a1d97a9b9e1d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-10 03:40:37 +00:00
Qt Submodule Update Bot	6498e80ba0	Update submodules on '6.9.0 in qt/qt5' Change-Id: I88cdf1a3d61154f18b7d76c8a53d1fc7a4119e0a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-03-06 02:08:17 +00:00
Timur Pocheptsov	42772064c5	install-ffmpeg-ios.sh: use a proper dylib regexp To fix only names of FFmpeg frameworks, not system libraries/dylibs. Fixes: QTBUG-134289 Change-Id: I74ef7700549abdccbe569ecd5d8e780fefca6e11 Reviewed-by: Simo Fält <simo.falt@qt.io>	2025-03-06 02:08:16 +00:00
Simo Fält	9babd80169	COIN: Add Debian packaging config for Debian 12 Pick-to: dev 6.9 6.8 Change-Id: Ifaf0db9b9d39c6e66003e34e6c19957b60d0289f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2025-03-05 12:06:59 +02:00
Jani Heikkinen	da35483fb0	Adjust submodule branches Change-Id: I36d9acb7a7db1ce98451638a84d76793044be0df	2025-03-03 05:55:05 +00:00