mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-26 01:46:20 +08:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
244fc45435 | ||
|
|
462345a443 | ||
|
|
43e1a3d2f5 | ||
|
|
7e5f5266db | ||
|
|
f548b71f7d | ||
|
|
f8f18afaa2 | ||
|
|
15edd7b4f9 | ||
|
|
118535d55b | ||
|
|
bdc4c02b1c | ||
|
|
3e76115b8a | ||
|
|
bec7d8ae9d | ||
|
|
da6f809acc | ||
|
|
64cbeda777 |
84
.gitmodules
vendored
84
.gitmodules
vendored
@@ -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
|
||||
|
||||
@@ -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',
|
||||
|
||||
]
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
2
qt3d
Submodule qt3d updated: 2a095cb1c1...49e104ccbb
Submodule qt5compat updated: 29a26f6139...e1fe0c83bc
Submodule qtactiveqt updated: bb3fdd62ce...98ab3e859e
2
qtbase
2
qtbase
Submodule qtbase updated: 0ef9d8a49a...33f5e985e4
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 9447efd92b...4fe54c9522
2
qtcoap
2
qtcoap
Submodule qtcoap updated: bdb08a15e2...fe830233df
Submodule qtconnectivity updated: 5e9aafb623...e5a5b47da0
Submodule qtdatavis3d updated: 4729ecec52...c83ccedb91
Submodule qtdeclarative updated: 6ad23dc402...e559d5cf2b
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 1888bb12c3...5cb1ecfc10
2
qtgraphs
2
qtgraphs
Submodule qtgraphs updated: 2d7f56125c...6dab74363a
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: f9d002ff19...75ae2e107b
Submodule qthttpserver updated: 4a0689fcd8...507dd32a7b
Submodule qtimageformats updated: 75580e84a3...4993279e9e
Submodule qtlanguageserver updated: 48c21380e3...f507ab9d5c
Submodule qtlocation updated: 83ae4e1028...00b7fb675e
2
qtlottie
2
qtlottie
Submodule qtlottie updated: b27226c5ae...710cb58faa
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: 07488f3e48...c0b5b7d3f1
Submodule qtmultimedia updated: bbc54f57f7...fcb9950381
Submodule qtnetworkauth updated: 770f187248...8c7a6264d1
2
qtopcua
2
qtopcua
Submodule qtopcua updated: 3149168698...c9eea2716b
Submodule qtpositioning updated: f29ffe4998...a76d1bbab1
2
qtqa
2
qtqa
Submodule qtqa updated: 023e8e1580...71a7d60974
Submodule qtquick3d updated: f2a50b5682...5bba89db05
Submodule qtquick3dphysics updated: 5e94d9d576...26768a5567
Submodule qtquickeffectmaker updated: 38263603e6...a5574423f3
Submodule qtquicktimeline updated: 9fd02040ac...b2a8a25f7b
Submodule qtremoteobjects updated: 8ce89cee1c...ea62543b4b
Submodule qtrepotools updated: 5eb547fab9...0fd86a1cba
2
qtscxml
2
qtscxml
Submodule qtscxml updated: ac136821df...d28ca45753
Submodule qtsensors updated: 0215108e26...9e54af12a4
Submodule qtserialbus updated: 122e29a034...9b02d428cf
Submodule qtserialport updated: ee3aec726e...5c352984a4
Submodule qtshadertools updated: 0d220cf397...ded671b8c1
2
qtspeech
2
qtspeech
Submodule qtspeech updated: fac7a6661c...f3916f5c43
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 63aa538a41...da7e04eaa5
2
qttools
2
qttools
Submodule qttools updated: 18f9224e7a...d7c950e5cf
Submodule qttranslations updated: 4a327a0fa8...94e46555ac
Submodule qtvirtualkeyboard updated: 3b1b942c42...5150eb3367
Submodule qtwayland updated: c30ad58ae3...3110f77973
Submodule qtwebchannel updated: ec6bad4664...bcd5de8e9f
Submodule qtwebengine updated: a7b34c221d...f30957b9ee
Submodule qtwebsockets updated: 3453625f82...090fb14fa3
Submodule qtwebview updated: ef26a23cee...ce7336b811
Reference in New Issue
Block a user