Compare commits

...

13 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
244fc45435 Update submodules on '6.6.0 in qt/qt5'
Change-Id: I66682550e2e10f1d48f0d12f18d62418c0e52a92
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-04 05:20:22 +00:00
Qt Submodule Update Bot
462345a443 Update submodules on '6.6.0 in qt/qt5'
Change-Id: I14687fb8e4084f7d0c2150331db1d09150cd9858
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-02 17:24:10 +00:00
Simo Fält
43e1a3d2f5 COIN: Use Ubuntu Focal chroot instead of Debian stable
We need to use older chroot to build debian packages.

Pick-to: 6.6 dev
Task-number: QTBUG-117120
Change-Id: I044e398324c380716b309dad5b087e97bc6688ab
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-10-01 18:25:49 +03:00
Qt Submodule Update Bot
7e5f5266db Update submodules on '6.6.0 in qt/qt5'
Change-Id: I23fc73c5331db008857709fbbf03f76db52a912b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-01 15:25:44 +00:00
Elias Toivola
f548b71f7d Fix FFmpeg nv-codec file SHA and cache
External URL file SHA changed and the cache file didn't exist.

Task-number: QTQAINFRA-5862
Change-Id: Ib4670d367d6541e67eb54dd3fb84079548b13722
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit bbbe558077)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 710d6e5cb0)
2023-10-01 15:25:40 +00:00
Simo Fält
f8f18afaa2 CI: Fix cmake debian package path for arm
Pick-to: dev 6.6
Change-Id: Ib1ea0b7bec0e00b50c957ae0f530284ae32bbe9b
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-10-01 15:25:33 +00:00
Qt Submodule Update Bot
15edd7b4f9 Update submodules on '6.6.0 in qt/qt5'
Change-Id: I0fb49899126f2e455816f7e42e23df668e6118db
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-28 20:30:35 +00:00
Qt Submodule Update Bot
118535d55b Update submodules on '6.6.0 in qt/qt5'
Change-Id: I0f2ce2f80a399944312fe21fb388859141e6d5af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-27 02:41:57 +00:00
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
54 changed files with 111 additions and 97 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

@@ -287,6 +287,8 @@ Configurations:
Environment variables: [
'DEBIAN_RULES_REF=6.6_dev',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
'COIN_SBUILD_CHROOT=focal-arm64-sbuild',
'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse',
]
-
Id: 'focal-amd64-debian-pkg-packaging'
@@ -296,4 +298,7 @@ Configurations:
Environment variables: [
'DEBIAN_RULES_REF=6.6_dev',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
'COIN_SBUILD_CHROOT=focal-amd64-sbuild',
'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ focal main universe multiverse',
]

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

@@ -68,8 +68,8 @@ ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.t
install_ff_nvcodec_headers() {
nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip"
nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/$nv_codec_version.zip"
nv_codec_sha1="bfaa2801725a2eea476939f2177ab50817c3a6ad"
nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip"
nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
#nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version"
if [ ! -d "$nv_codec_dir" ];

View File

@@ -213,6 +213,7 @@ installPackages+=(net-tools)
installPackages+=(bridge-utils)
## For debian building debian packages
installPackages+=(sbuild)
installPackages+=(ubuntu-dev-tools)
installPackages+=(apt-cacher-ng)
installPackages+=(devscripts)
installPackages+=(piuparts)

View File

@@ -77,12 +77,15 @@ sudo sbuild-adduser $LOGNAME
newgrp sbuild
# Create chroot
#sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild http://127.0.0.1:3142/deb.debian.org/debian
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64
# For ubuntu 20.04
echo "Create chroot for Ubuntu Focal"
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-arm64 http://ports.ubuntu.com/ubuntu-ports/
echo "Done creating chroot for Ubuntu Focal"
# Update chroot
sudo sbuild-update -udcar stable
sudo sbuild-update -udcar focal

View File

@@ -43,7 +43,7 @@
mkdir -p /home/qt/debian_packages
cd /home/qt/debian_packages
# Backported cmake 3.24
wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-focal/cmake-3.24-deb.tar.gz
wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-focal/cmake-3.24-deb.tar.gz
tar xzf cmake-3.24-deb.tar.gz
# get rest of ready made Ubuntu focal arm debian packages
# so that sbuild can find those

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

View File

@@ -251,6 +251,7 @@ installPackages+=(net-tools)
installPackages+=(bridge-utils)
# For Debian packaging
installPackages+=(sbuild)
installPackages+=(ubuntu-dev-tools)
echo "Running update for apt"
waitLoop

View File

@@ -77,12 +77,15 @@ sudo sbuild-adduser $LOGNAME
newgrp sbuild
# Create chroot
#sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64-sbuild http://127.0.0.1:3142/deb.debian.org/debian
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64-sbuild
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64
# For ubuntu 20.04
echo "Create chroot for Ubuntu Focal"
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-amd64 http://archive.ubuntu.com/ubuntu/
echo "Done creating chroot for Ubuntu Focal"
# Update chroot
sudo sbuild-update -udcar stable
sudo sbuild-update -udcar focal

2
qt3d

Submodule qt3d updated: 2a095cb1c1...49e104ccbb

2
qtbase

Submodule qtbase updated: 0ef9d8a49a...33f5e985e4

2
qtcoap

Submodule qtcoap updated: bdb08a15e2...fe830233df

2
qtdoc

Submodule qtdoc updated: 1888bb12c3...5cb1ecfc10

2
qtgrpc

Submodule qtgrpc updated: f9d002ff19...75ae2e107b

2
qtmqtt

Submodule qtmqtt updated: 07488f3e48...c0b5b7d3f1

Submodule qtopcua updated: 3149168698...c9eea2716b

2
qtqa

Submodule qtqa updated: 023e8e1580...71a7d60974

Submodule qtscxml updated: ac136821df...d28ca45753

2
qtsvg

Submodule qtsvg updated: 63aa538a41...da7e04eaa5

Submodule qttools updated: 18f9224e7a...d7c950e5cf