Compare commits

...

5 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
bdc4c02b1c Update submodules on '6.6.0 in qt/qt5'
Change-Id: Iecab4f25a5f250cd35fef23209fe41fdfb954352
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-21 21:35:57 +00:00
Allan Sandfeld Jensen
3e76115b8a Add vulkan package to SLES
Helps build vulkan support in qtbase, and vaapi support in qtwebengine

Task-number: QTBUG-115722
Change-Id: If51bc6a91c69829313991bfa9172026ce54476f7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b49729a50c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9166555fb3)
2023-09-20 20:38:56 +00:00
Nicholas Bennett
bec7d8ae9d Docs: Make sure documentation tests run on QtAA integration
Previously the dedicated documentation config was removed in favor of including
ubuntu-22.04-documentation.
Since then, that configuration lost the TestDocs flag. It now comes with
ubuntu-22.04-documentation-x11-tests instead, so this change adds that
configuration.

Change-Id: I046f79aa8810ded6aa6dd07814ff43dd3fa2bbe8
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 6fea315c0f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6146c70d06)
2023-09-20 20:38:56 +00:00
Qt Submodule Update Bot
da6f809acc Update submodules on '6.6.0 in qt/qt5'
Change-Id: I80774a1100526a72f63a54a3f0a26bf135d6c03b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-20 16:24:48 +00:00
Jani Heikkinen
64cbeda777 Adjust submodule branches
Change-Id: I4bd5af3cf68d4a0a1e566b6235c995c56f6fc142
2023-09-13 11:19:23 +03:00
47 changed files with 89 additions and 88 deletions

84
.gitmodules vendored
View File

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

View File

@@ -3,7 +3,8 @@ Include: [
cmake_platforms.yaml: [
'rhel-8.6',
'windows-10_22h2-mingw11',
'ubuntu-22.04-documentation'
'ubuntu-22.04-documentation',
'ubuntu-22.04-documentation-x11-tests'
],
macos.yaml: [
'macos-universal-on-x86_64'

View File

@@ -94,7 +94,7 @@ sudo zypper -nq install --force-resolution libxcb-cursor0 xcb-util-cursor-devel
sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel \
libgbm-devel Mesa-dri-devel
libgbm-devel Mesa-dri-devel vulkan-devel
# qtwebengine, qtmultimedia+ffmpeg
sudo zypper -nq install libva-devel

2
qt3d

Submodule qt3d updated: 2a095cb1c1...d849a81cfd

2
qtbase

Submodule qtbase updated: 0ef9d8a49a...f041e662c9

2
qtcoap

Submodule qtcoap updated: bdb08a15e2...d4c1911880

2
qtdoc

Submodule qtdoc updated: 1888bb12c3...9c3a1c848c

2
qtgrpc

Submodule qtgrpc updated: f9d002ff19...1ac245ade5

2
qtmqtt

Submodule qtmqtt updated: 07488f3e48...f1fda3c176

Submodule qtopcua updated: 3149168698...6c281d8fee

2
qtqa

Submodule qtqa updated: 023e8e1580...cc66698fc3

Submodule qtscxml updated: ac136821df...02a801ae3c

2
qtsvg

Submodule qtsvg updated: 63aa538a41...a9d02600d1

Submodule qttools updated: 18f9224e7a...30805c5957