Compare commits

...

6 Commits
6.9 ... v6.9.2

Author SHA1 Message Date
Qt Submodule Update Bot
af7939f2df Update submodules on '6.9.2 in qt/qt5'
Change-Id: Iedd52189c4c32a8bdd173daa3436d61b43aa2bbd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-08-18 07:49:14 +00:00
Simo Fält
2dbbd0853f COIN: Fix Debian bookworm chroot
Debian stable codename is now trixie.

Pick-to: 6.9 6.10 dev 6.8
Change-Id: I296782cef2a4329e359413cd7515a8dfca271095
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-08-15 09:57:40 +03:00
Qt Submodule Update Bot
d733965500 Update submodules on '6.9.2 in qt/qt5'
Change-Id: I5c7dc7a1ea645ecd231b5b1d8f3ec69244358c6d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-08-14 10:45:09 +00:00
Qt Submodule Update Bot
7fda2af3ec Update submodules on '6.9.2 in qt/qt5'
Change-Id: Ibadc7fbb752b98dcc356f77dfc419e45ef8fc144
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-08-13 04:51:29 +00:00
Qt Submodule Update Bot
027e3f569c Update submodules on '6.9.2 in qt/qt5'
Change-Id: I6072584c9b4bde947e208cded3d594c4888e28a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-08-07 22:42:08 +00:00
Jani Heikkinen
3bc2f1c646 Adjust submodule branches
Change-Id: I3d4b6cf523da013904f11f518e34273ae6d6d923
2025-08-06 05:47:47 +01:00
45 changed files with 89 additions and 89 deletions

86
.gitmodules vendored
View File

@@ -1,40 +1,40 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = 6.9 branch = 6.9.2
status = essential status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
depends = qtbase depends = qtbase
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 6.9 branch = 6.9.2
status = essential status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
depends = qtbase depends = qtbase
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase qtshadertools depends = qtbase qtshadertools
recommends = qtdeclarative qtquick3d recommends = qtdeclarative qtquick3d
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qttools"] [submodule "qttools"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtactiveqt recommends = qtdeclarative qtactiveqt
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 6.9 branch = 6.9.2
status = essential status = essential
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
depends = qtbase depends = qtbase
@@ -47,7 +47,7 @@
depends = qttools depends = qttools
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 6.9 branch = 6.9.2
status = essential status = essential
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia qtshadertools qtwebengine recommends = qtmultimedia qtshadertools qtwebengine
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 6.9 branch = 6.9.2
status = essential status = essential
priority = 40 priority = 40
[submodule "qtrepotools"] [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
depends = qtbase depends = qtbase
path = qtqa path = qtqa
url = ../qtqa.git url = ../qtqa.git
branch = 6.9 branch = 6.9.2
status = essential status = essential
priority = 50 priority = 50
[submodule "qtlocation"] [submodule "qtlocation"]
@@ -76,21 +76,21 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
branch = 6.9 branch = 6.9.2
status = preview status = preview
[submodule "qtpositioning"] [submodule "qtpositioning"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtserialport recommends = qtdeclarative qtserialport
path = qtpositioning path = qtpositioning
url = ../qtpositioning.git url = ../qtpositioning.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtsensors"] [submodule "qtsensors"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtsystems"] [submodule "qtsystems"]
depends = qtbase depends = qtbase
@@ -117,61 +117,61 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtwayland"] [submodule "qtwayland"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qt3d"] [submodule "qt3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtshadertools qtmultimedia recommends = qtdeclarative qtshadertools qtmultimedia
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 6.9 branch = 6.9.2
status = deprecated status = deprecated
[submodule "qtimageformats"] [submodule "qtimageformats"]
depends = qtbase depends = qtbase
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtserialbus"] [submodule "qtserialbus"]
depends = qtbase depends = qtbase
recommends = qtserialport recommends = qtserialport
path = qtserialbus path = qtserialbus
url = ../qtserialbus.git url = ../qtserialbus.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtserialport"] [submodule "qtserialport"]
depends = qtbase depends = qtbase
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtwebsockets recommends = qtdeclarative qtwebsockets
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtwebengine"] [submodule "qtwebengine"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning recommends = qtwebchannel qttools qtpositioning
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
priority = 10 priority = 10
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
recommends = qtwebengine recommends = qtwebengine
path = qtwebview path = qtwebview
url = ../qtwebview.git url = ../qtwebview.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtcharts"] [submodule "qtcharts"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtcharts path = qtcharts
url = ../qtcharts.git url = ../qtcharts.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtdatavis3d"] [submodule "qtdatavis3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtdatavis3d path = qtdatavis3d
url = ../qtdatavis3d.git url = ../qtdatavis3d.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtvirtualkeyboard"] [submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia recommends = qtmultimedia
path = qtvirtualkeyboard path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git url = ../qtvirtualkeyboard.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtgamepad"] [submodule "qtgamepad"]
depends = qtbase depends = qtbase
@@ -219,27 +219,27 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtscxml path = qtscxml
url = ../qtscxml.git url = ../qtscxml.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtspeech"] [submodule "qtspeech"]
depends = qtbase qtmultimedia depends = qtbase qtmultimedia
recommends = qtdeclarative recommends = qtdeclarative
path = qtspeech path = qtspeech
url = ../qtspeech.git url = ../qtspeech.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtnetworkauth"] [submodule "qtnetworkauth"]
depends = qtbase depends = qtbase
path = qtnetworkauth path = qtnetworkauth
url = ../qtnetworkauth.git url = ../qtnetworkauth.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtremoteobjects"] [submodule "qtremoteobjects"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtremoteobjects path = qtremoteobjects
url = ../qtremoteobjects.git url = ../qtremoteobjects.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtwebglplugin"] [submodule "qtwebglplugin"]
depends = qtbase qtwebsockets depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtlottie path = qtlottie
url = ../qtlottie.git url = ../qtlottie.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtquicktimeline"] [submodule "qtquicktimeline"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtquicktimeline path = qtquicktimeline
url = ../qtquicktimeline url = ../qtquicktimeline
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtquick3d"] [submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline recommends = qtquicktimeline
path = qtquick3d path = qtquick3d
url = ../qtquick3d.git url = ../qtquick3d.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtshadertools"] [submodule "qtshadertools"]
depends = qtbase depends = qtbase
path = qtshadertools path = qtshadertools
url = ../qtshadertools.git url = ../qtshadertools.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qt5compat"] [submodule "qt5compat"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qt5compat path = qt5compat
url = ../qt5compat.git url = ../qt5compat.git
branch = 6.9 branch = 6.9.2
status = deprecated status = deprecated
[submodule "qtcoap"] [submodule "qtcoap"]
depends = qtbase depends = qtbase
path = qtcoap path = qtcoap
url = ../qtcoap.git url = ../qtcoap.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtmqtt"] [submodule "qtmqtt"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
recommends = qtwebsockets recommends = qtwebsockets
path = qtmqtt path = qtmqtt
url = ../qtmqtt.git url = ../qtmqtt.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtopcua"] [submodule "qtopcua"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtopcua path = qtopcua
url = ../qtopcua.git url = ../qtopcua.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtlanguageserver"] [submodule "qtlanguageserver"]
depends = qtbase depends = qtbase
path = qtlanguageserver path = qtlanguageserver
url = ../qtlanguageserver.git url = ../qtlanguageserver.git
branch = 6.9 branch = 6.9.2
status = preview status = preview
[submodule "qthttpserver"] [submodule "qthttpserver"]
depends = qtbase depends = qtbase
recommends = qtwebsockets recommends = qtwebsockets
path = qthttpserver path = qthttpserver
url = ../qthttpserver.git url = ../qthttpserver.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtquick3dphysics"] [submodule "qtquick3dphysics"]
depends = qtbase qtdeclarative qtquick3d qtshadertools depends = qtbase qtdeclarative qtquick3d qtshadertools
path = qtquick3dphysics path = qtquick3dphysics
url = ../qtquick3dphysics.git url = ../qtquick3dphysics.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtgrpc"] [submodule "qtgrpc"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtgrpc path = qtgrpc
url = ../qtgrpc.git url = ../qtgrpc.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtquickeffectmaker"] [submodule "qtquickeffectmaker"]
depends = qtbase qtdeclarative qtshadertools depends = qtbase qtdeclarative qtshadertools
recommends = qtquick3d recommends = qtquick3d
path = qtquickeffectmaker path = qtquickeffectmaker
url = ../qtquickeffectmaker.git url = ../qtquickeffectmaker.git
branch = 6.9 branch = 6.9.2
status = addon status = addon
[submodule "qtgraphs"] [submodule "qtgraphs"]
depends = qtbase qtdeclarative qtquick3d depends = qtbase qtdeclarative qtquick3d
path = qtgraphs path = qtgraphs
url = ../qtgraphs.git url = ../qtgraphs.git
branch = 6.9 branch = 6.9.2
status = addon status = addon

View File

@@ -304,7 +304,7 @@ Configurations:
'DEBIAN_RULES_REF=6.9_gles', 'DEBIAN_RULES_REF=6.9_gles',
'COIN_TARGET_DIST=tqtc-bookworm', 'COIN_TARGET_DIST=tqtc-bookworm',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/', 'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
'COIN_SBUILD_CHROOT=stable-arm64-sbuild', 'COIN_SBUILD_CHROOT=bookworm-arm64-sbuild',
'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main', 'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
] ]

View File

@@ -41,8 +41,8 @@ EOF
sudo sbuild-adduser "$LOGNAME" sudo sbuild-adduser "$LOGNAME"
newgrp sbuild newgrp sbuild
# Create chroot for debian stable # Create chroot for debian bookworm
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64 sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-arm64
echo "Create chroot for Ubuntu Jammy" echo "Create chroot for Ubuntu Jammy"
# First we need update the deboostrap scripts # First we need update the deboostrap scripts
@@ -60,5 +60,5 @@ sudo sbuild-createchroot --include=gnupg,ca-certificates jammy /srv/chroot/jammy
echo "Done creating chroot for Ubuntu Jammy" echo "Done creating chroot for Ubuntu Jammy"
# Update chroot. # Update chroot.
sudo sbuild-update -udcar stable sudo sbuild-update -udcar bookworm
sudo sbuild-update -udcar jammy sudo sbuild-update -udcar jammy

2
qt3d

Submodule qt3d updated: e32ae4fcf6...86f4616dd1

2
qtbase

Submodule qtbase updated: a538f0a160...6f0d27d2e4

2
qtcoap

Submodule qtcoap updated: 81665b69ae...68a25c0fcc

2
qtdoc

Submodule qtdoc updated: 9fd6eb7c1a...924db889ca

2
qtgrpc

Submodule qtgrpc updated: e589950c3a...2d421fe447

2
qtmqtt

Submodule qtmqtt updated: f2b7088422...3bbef1d764

Submodule qtopcua updated: 007bdbfc66...2956ec8738

Submodule qtscxml updated: b024d02b7d...dc7bdbd8a7

2
qtsvg

Submodule qtsvg updated: 1f0a4f3a4b...56928697e4

Submodule qttools updated: 0fc7b3a756...f117f860ed