Compare commits

..

3 Commits
6.11 ... 6.11.1

Author SHA1 Message Date
Qt Submodule Update Bot
209b38121b Update submodules on '6.11.1 in qt/qt5'
Change-Id: I104ff68a263f38f9368691b89f1e1ba3b078d283
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-04-29 19:28:27 +00:00
Qt Submodule Update Bot
605975903d Update submodules on '6.11.1 in qt/qt5'
Change-Id: Ia75e0c4ef3b4a27f2f680375671d807cb6ef851e
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2026-04-28 04:42:07 +00:00
Jani Heikkinen
95c482caaa Adjust submodule branches
Change-Id: I3c2441871d755e936e5f7e62922c7da33a3c56ab
2026-04-27 06:05:23 +01:00
52 changed files with 103 additions and 139 deletions

92
.gitmodules vendored
View File

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

View File

@@ -1,20 +0,0 @@
#!/usr/bin/env bash
# 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
# This script verifies that all installed packages originate from the current release version and not from newer releases.
# The caller provides a regex that matches the allowed release version and excludes packages from newer releases.
set -ex
verify_release_packages() {
local regex_verify="$1"
if rpm -qa --queryformat="%{NAME} %{RELEASE}\n" | grep -E " .*$regex_verify" >/dev/null; then
echo "Found packages that belong to other RHEL release, aborting"
exit 1
else
echo "All package versions checked OK"
fi
}

View File

@@ -9,19 +9,19 @@ source "${BASH_SOURCE%/*}/DownloadURL.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# This script will install go 1.26.2
version="1.26.2"
# This script will install go 1.25.2
version="1.25.2"
if [[ "$os" == "linux" ]]; then
uname_m="$(uname -m)"
case "$uname_m" in
x86_64|amd64)
sha256="990e6b4bbba816dc3ee129eaeaf4b42f17c2800b88a2166c265ac1a200262282"
sha256="a08c8c36946c86890ca46185765da34442ce64aa"
pkgname="go$version.linux-amd64.tar.gz"
dirname="go$version.linux-amd64"
;;
arm64|aarch64)
sha256="c958a1fe1b361391db163a485e21f5f228142d6f8b584f6bef89b26f66dc5b23"
sha256="13690a4ecac03e6cca6988a6d2ce80bfa938eb7b"
pkgname="go$version.linux-arm64.tar.gz"
dirname="go$version.linux-arm64"
;;
@@ -31,12 +31,12 @@ elif [ "$os" == "macos" ]; then
uname_m="$(uname -m)"
case "$uname_m" in
x86_64|amd64)
sha256="bc3f1500d9968c36d705442d90ba91addf9271665033748b82532682e90a7966"
sha256="eda89df8fd85a49e4046f85340236248a5d2a7cd"
pkgname="go$version.darwin-amd64.tar.gz"
dirname="go$version.darwin-amd64"
;;
arm64|aarch64)
sha256="32af1522bf3e3ff3975864780a429cc0b41d190ec7bf90faa661d6d64566e7af"
sha256="1745a71d18f9946f7aac9f9528e3227c8132cc08"
pkgname="go$version.darwin-arm64.tar.gz"
dirname="go$version.darwin-arm64"
;;

View File

@@ -3,23 +3,23 @@
. "$PSScriptRoot\helpers.ps1"
$version = "1.26.2"
$version = "1.22.4"
$cpu_arch = Get-CpuArchitecture
switch ($cpu_arch) {
x64 {
$arch = "amd64"
$sha256 = "84826eca833548bb2beabe7429052eaaec18faa902fde723898d906b42e59a73"
$sha256 = "3c21105d7b584759b6e266383b777caf6e87142d304a10b539dbc66ab482bb5f"
break
}
x86 {
$arch = "386"
$sha256 = "9a63074567b8a0a94091e8f6c2096f5d4d0369c7bbaed08158a63004d8b8cac1"
$sha256 = "5c6446e2ea80bc6a971d2b34446f16e6517e638b0ff8d3ea229228d1931790b0"
break
}
arm64 {
$arch = "arm64"
$sha256 = "f59e0e51370cac7ab5742c4ed9fc151f0a20918396c893996125a1c6ed7d9525"
$sha256 = "553cc6c460f4e3eb4fad5b897c0bb22cd8bbeb20929f0e3eeb939420320292ce"
break
}
default {

View File

@@ -20,7 +20,6 @@ $url_cache = "https://ci-files01-hki.ci.qt.io/input/windows/$package"
$url_official = "http://repo.msys2.org/distrib/$arch/$package"
$TargetLocation = "C:\Utils"
$required_packages = @("perl", "make", "yasm", "diffutils")
if ((Test-Path $url_cache_prebuilt)) {
$PackagePath = "C:\Windows\Temp\$package_prebuilt"
@@ -36,8 +35,7 @@ if ((Test-Path $url_cache_prebuilt)) {
# install perl make and yasm
# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
$required_packages_string = $required_packages -join ' '
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman-key --refresh;pacman -S --noconfirm $required_packages_string`""
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman-key --refresh;pacman -S --noconfirm perl make yasm diffutils`""
Start-Sleep -s 60
cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
@@ -48,16 +46,6 @@ if ((Test-Path $url_cache_prebuilt)) {
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
}
$msys = "C:\Utils\msys64\usr\bin\bash"
# Confirm that we have the correct packages installed, in case prebuilt MSYS
# binaries are missing them.
$installed = & "$msys" -lc "pacman -Qq"
$installedSet = $installed | Sort-Object -Unique
$missing_packages = $required_packages | Where-Object { $_ -notin $installedSet }
if ($missing_packages.Count -ne 0) {
throw "Missing MSYS packages: $($missing_packages -join ' ')"
}
Write-Host "Cleaning $PackagePath.."
Remove "$PackagePath"

View File

@@ -9,13 +9,9 @@
set -ex
# shellcheck disable=SC2129
source "${BASH_SOURCE%/*}/../common/linux/verify-release-packages.sh"
echo "*********************************************" >> ~/versions.txt
echo "***** All installed RPM packages *****" >> ~/versions.txt
rpm -q -a | sort >> ~/versions.txt
echo "*********************************************" >> ~/versions.txt
"$(dirname "$0")/../common/linux/version.sh"
verify_release_packages "10_[1-9]"

2
qt3d

Submodule qt3d updated: 4e0e4e785c...d7aadf29b3

2
qtbase

Submodule qtbase updated: a87b63b660...87f46bc6c2

2
qtcoap

Submodule qtcoap updated: 76d48630e7...7ba7985154

2
qtdoc

Submodule qtdoc updated: 922dacedd0...374f431fe3

2
qtgrpc

Submodule qtgrpc updated: 630e2d5a2a...efb1fd3a46

2
qtmqtt

Submodule qtmqtt updated: 573a27b958...f41657f9d3

Submodule qtopcua updated: 196f204fcf...c74649449d

2
qtqa

Submodule qtqa updated: 87684b758a...ac7336f88c

Submodule qtscxml updated: 39797748a2...69f5a0dd4b

2
qtsvg

Submodule qtsvg updated: a1c880e4bc...c27a3fedcf

Submodule qttools updated: a67a0b7777...1ccd944d02