Compare commits

...

3 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
f00a460c60 Update submodules on '6.11 in qt/qt5'
Change-Id: I9207ec0945a946f08e952de36d68de4d2780df3b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-12 04:19:43 +00:00
Eike Ziller
69a8b1abfe COIN/QtCreator: Move to RHEL 9 and macOS 15 for QtC 19+
Updating for raising the compiler requirements.
Also adds Ubuntu 22 to test with GCC 11

Since Qt Creator branches can use the same Qt branches
that define these platforms, keep one RHEL 8 job
for Qt Creator 18. Mark it in the features, so the
Qt Creator 19+ configuration can filter these out.

Pick-to: 6.10
Change-Id: Ib771f473b6ed3ce42c6191647da7d473b64c2316
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit dcd07cc2ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-12-09 09:04:18 +00:00
Jani Heikkinen
c78156feca Adjust submodule branches
Change-Id: I5d87a40dc71574e17aa95accd460d8040cc64758
2025-12-08 06:00:14 +00:00
47 changed files with 108 additions and 95 deletions

92
.gitmodules vendored
View File

@@ -1,40 +1,40 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = dev branch = 6.11
status = essential status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = dev branch = 6.11
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 = dev branch = 6.11
status = essential status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
depends = qtbase depends = qtbase
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
status = essential status = essential
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia qtshadertools qttasktree qtwebengine recommends = qtmultimedia qtshadertools qttasktree qtwebengine
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
status = deprecated status = deprecated
[submodule "qtimageformats"] [submodule "qtimageformats"]
depends = qtbase depends = qtbase
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = dev branch = 6.11
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 = dev branch = 6.11
status = addon status = addon
[submodule "qtserialport"] [submodule "qtserialport"]
depends = qtbase depends = qtbase
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
status = deprecated status = deprecated
[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 = dev branch = 6.11
status = deprecated status = deprecated
[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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
status = addon status = addon
[submodule "qtnetworkauth"] [submodule "qtnetworkauth"]
depends = qtbase depends = qtbase
path = qtnetworkauth path = qtnetworkauth
url = ../qtnetworkauth.git url = ../qtnetworkauth.git
branch = dev branch = 6.11
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 = dev branch = 6.11
status = addon status = addon
[submodule "qtwebglplugin"] [submodule "qtwebglplugin"]
depends = qtbase qtwebsockets depends = qtbase qtwebsockets
@@ -252,107 +252,107 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtlottie path = qtlottie
url = ../qtlottie.git url = ../qtlottie.git
branch = dev branch = 6.11
status = addon status = addon
[submodule "qtquicktimeline"] [submodule "qtquicktimeline"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtquicktimeline path = qtquicktimeline
url = ../qtquicktimeline url = ../qtquicktimeline
branch = dev branch = 6.11
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 = dev branch = 6.11
status = addon status = addon
[submodule "qtshadertools"] [submodule "qtshadertools"]
depends = qtbase depends = qtbase
path = qtshadertools path = qtshadertools
url = ../qtshadertools.git url = ../qtshadertools.git
branch = dev branch = 6.11
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 = dev branch = 6.11
status = deprecated status = deprecated
[submodule "qtcoap"] [submodule "qtcoap"]
depends = qtbase depends = qtbase
path = qtcoap path = qtcoap
url = ../qtcoap.git url = ../qtcoap.git
branch = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
status = addon status = addon
[submodule "qtlanguageserver"] [submodule "qtlanguageserver"]
depends = qtbase depends = qtbase
path = qtlanguageserver path = qtlanguageserver
url = ../qtlanguageserver.git url = ../qtlanguageserver.git
branch = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
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 = dev branch = 6.11
status = addon status = addon
[submodule "qttasktree"] [submodule "qttasktree"]
depends = qtbase depends = qtbase
path = qttasktree path = qttasktree
url = ../qttasktree.git url = ../qttasktree.git
branch = dev branch = 6.11
status = preview status = preview
[submodule "qtopenapi"] [submodule "qtopenapi"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtopenapi path = qtopenapi
url = ../qtopenapi.git url = ../qtopenapi.git
branch = dev branch = 6.11
status = preview status = preview
[submodule "qtcanvaspainter"] [submodule "qtcanvaspainter"]
depends = qtbase qtdeclarative qtshadertools depends = qtbase qtdeclarative qtshadertools
path = qtcanvaspainter path = qtcanvaspainter
url = ../qtcanvaspainter.git url = ../qtcanvaspainter.git
branch = dev branch = 6.11
status = preview status = preview

View File

@@ -9,7 +9,7 @@ Configurations:
Environment variables: [] Environment variables: []
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
- -
Template: 'qtci-linux-RHEL-8.10-x86_64-51' Template: 'qtci-linux-RHEL-9.4-x86_64-50'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['Sccache', 'DebugAndRelease'] Features: ['Sccache', 'DebugAndRelease']
Configure arguments: '' Configure arguments: ''
@@ -21,7 +21,7 @@ Configurations:
Configure arguments: '' Configure arguments: ''
Environment variables: [] Environment variables: []
- -
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['Sccache', 'DebugAndRelease'] Features: ['Sccache', 'DebugAndRelease']
Configure arguments: '' Configure arguments: ''
@@ -43,17 +43,30 @@ Configurations:
Environment variables: [] Environment variables: []
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
- -
Template: 'qtci-linux-RHEL-8.10-x86_64-51' Template: 'qtci-linux-RHEL-9.4-x86_64-50'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
Configure arguments: '' Configure arguments: ''
Environment variables: [] Environment variables: []
- -
Template: 'qtci-macos-14-arm-106' Template: 'qtci-linux-RHEL-8.10-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'QtC18AndEarlier']
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-macos-15-arm-104'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
Configure arguments: '' Configure arguments: ''
Environment variables: [] Environment variables: []
# Tests GCC 11
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
Configure arguments: ''
Environment variables: []
# license check # license check
- -
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'

2
qt3d

Submodule qt3d updated: 60f3bfa206...cae635df4c

2
qtbase

Submodule qtbase updated: 44b6b62d83...53a8f242ed

2
qtcoap

Submodule qtcoap updated: 50720cab42...887b6eda7b

2
qtdoc

Submodule qtdoc updated: be0f24b2ee...05985de0be

2
qtgrpc

Submodule qtgrpc updated: 018343f095...6f35b0fb2d

2
qtmqtt

Submodule qtmqtt updated: b50be0baf7...9cfc4db145

Submodule qtopcua updated: c21b81e2a6...3176fe6fed

Submodule qtscxml updated: 01383d5b29...fc55b1b5d0

2
qtsvg

Submodule qtsvg updated: 976d0dab21...0e92982b52

Submodule qttools updated: 8eec8afd1b...ffde172b50