Compare commits

...

13 Commits
6.8 ... v6.8.3

Author SHA1 Message Date
Qt Submodule Update Bot
bab1fecd55 Update submodules on '6.8.3 in qt/qt5'
Change-Id: I61badc91bf1cb612135d04020db259f02a2637d3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-20 06:25:12 +00:00
Timur Pocheptsov
f62c07c716 install-ffmpeg-ios.sh: use a proper dylib regexp
To fix only names of FFmpeg frameworks, not system libraries/dylibs.

Pick-to: 6.9.0 6.8
Fixes: QTBUG-134289
Change-Id: I74ef7700549abdccbe569ecd5d8e780fefca6e11
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
2025-03-20 06:24:37 +00:00
Tim Blechmann
336fc07c80 provisioning: don't install openh264 and gstreamer for openSUSE 15.5
There don't seem any publicly available binaries for openh264 for
openSUSE 15.5 anymore. Removing gstreamer and openh264 headers will
allow us to build binaries, at the cost of not being able to build the
gstreamer plugin anymore.

Pick-to: 6.8 dev 6.9 6.9.0
Change-Id: Ief1e9eb3963e98a1e2b076c3a3bfd8bdeec21e3c
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
2025-03-20 06:24:32 +00:00
Jukka Jokiniva
61fab6d730 Pin nodejs version to 22
Latest nodejs (23.10.0) fails to install on arm Mac 12.
Brew install doesn't add to path automatically, so set
in the script after install.

Change-Id: Ibad6c362e5633cc656e9e580cfe4bd5ef4e5af2a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-03-20 08:24:26 +02:00
Qt Submodule Update Bot
7ea247f6cc Update submodules on '6.8.3 in qt/qt5'
Change-Id: Id736be94e291e19796b751687e41f3d334092d95
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-19 03:07:48 +00:00
Qt Submodule Update Bot
cfc20bd9de Update submodules on '6.8.3 in qt/qt5'
Change-Id: I316e0c2bed834e787c4c24a9acd4538643ea7956
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-16 02:06:47 +00:00
Qt Submodule Update Bot
fc625d5c8e Update submodules on '6.8.3 in qt/qt5'
Change-Id: I8f2ce360ac959314194018683b1609d9d3703961
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-14 06:29:30 +00:00
Qt Submodule Update Bot
9412ed738b Update submodules on '6.8.3 in qt/qt5'
Change-Id: Iebe0095d2f2bbab0716008fe1d8190d5d2d44157
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-13 17:15:46 +00:00
Simo Fält
adf7c5ab10 COIN: Fix Debian rules branch for Debian 12 config
Pick-to: 6.8
Change-Id: I0fad7926466696a18f25d73ffe6b5b56d228f2e3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-03-12 07:58:58 +02:00
Simo Fält
80fda87743 COIN: Add Debian packaging config for Debian 12
Change-Id: Ifaf0db9b9d39c6e66003e34e6c19957b60d0289f
(cherry picked from commit 9babd80169)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-03-12 07:58:55 +02:00
Rami Potinkara
f7c6506ec1 Provisioning: bump Android sdkBuildToolsVersion to 35
This patch bumps the sdkBuildToolsVersion used in Coin to 35.

Task-number: QTBUG-129461
Task-number: QTBUG-130283
Change-Id: I2e1fbdfd23cb854ec50625ff29331adc61abc32c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 7228be7f72)
2025-03-12 05:58:46 +00:00
Konsta Alajärvi
8c4c44877c Provisioning: bump Android sdkApiLevel to 35
This patch bumps the sdkApiLevel used in Coin to 35.

Task-number: QTBUG-129461
Task-number: QTBUG-130283
Change-Id: Ia26248982a2807b2d3554d1a7a7394efcf13f834
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 345aae01f5)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit fe60ef1781)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2025-03-12 07:58:34 +02:00
Jani Heikkinen
78e19dbd34 Adjust submodule branches
Change-Id: I6c0a29597804a51708336e35b0c602b9e6cb95ee
2025-03-05 05:43:15 +00:00
57 changed files with 125 additions and 109 deletions

86
.gitmodules vendored
View File

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

View File

@@ -289,3 +289,16 @@ Configurations:
'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
]
-
Id: 'bookworm-gles-arm64-debian-pkg-packaging'
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Compiler: 'GCC'
Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
Environment variables: [
'DEBIAN_RULES_REF=6.8_gles',
'COIN_TARGET_DIST=tqtc-bookworm',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
]

View File

@@ -26,8 +26,8 @@ toolsVersion="2.1"
toolsFile="commandlinetools-linux-6609375_latest.zip"
ndkVersionLatest="r26b"
ndkVersionDefault=$ndkVersionLatest
sdkBuildToolsVersion="34.0.0"
sdkApiLevel="android-34"
sdkBuildToolsVersion="35.0.1"
sdkApiLevel="android-35"
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"

View File

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersionLatest="r26b"
ndkVersionDefault="$ndkVersionLatest"
sdkBuildToolsVersion="34.0.0"
sdkBuildToolsVersion="35.0.1"
# this is compile sdk version
sdkApiLevel="android-34"
sdkApiLevel="android-35"
toolsSourceFile="$basePath/$toolsFile"

View File

@@ -19,6 +19,7 @@ ffmpeg_name="FFmpeg-$version"
target_dir="$HOME"
ffmpeg_source_dir="$target_dir/$ffmpeg_name"
prefix="/usr/local/ios/ffmpeg"
dylib_regex="^@rpath/.*\.dylib$"
if [ ! -d "$ffmpeg_source_dir" ];
then

View File

@@ -24,8 +24,8 @@ $ndkZip = "C:\Windows\Temp\android_ndk.zip"
$toolsVersion = "2.1"
$toolsFile = "commandlinetools-win-6609375_latest.zip"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-34"
$sdkBuildToolsVersion = "34.0.0"
$sdkApiLevel = "android-35"
$sdkBuildToolsVersion = "35.0.1"
$toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"

View File

@@ -48,9 +48,8 @@ sudo zypper -nq install libxml2-devel libxslt-devel
# yasm (for ffmpeg in multimedia)
sudo zypper -nq install yasm
# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel \
gstreamer-1.20-plugin-openh264 gstreamer-plugins-bad-devel
# pulseaudio (qtmultimedia)
sudo zypper -nq install libpulse-devel pipewire-devel
# cups
sudo zypper -nq install cups-devel

View File

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r26b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="34.0.0"
sdkBuildToolsVersion="35.0.1"
# this is compile sdk version
sdkApiLevel="android-34"
sdkApiLevel="android-35"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

View File

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r26b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="34.0.0"
sdkBuildToolsVersion="35.0.1"
# this is compile sdk version
sdkApiLevel="android-34"
sdkApiLevel="android-35"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

View File

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r26b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="34.0.0"
sdkBuildToolsVersion="35.0.1"
# this is compile sdk version
sdkApiLevel="android-34"
sdkApiLevel="android-35"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

View File

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r26b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="34.0.0"
sdkBuildToolsVersion="35.0.1"
# this is compile sdk version
sdkApiLevel="android-34"
sdkApiLevel="android-35"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

View File

@@ -2,7 +2,10 @@
#Copyright (C) 2023 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
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
set -ex
brew install nodejs
brew install node@22
SetEnvVar "PATH" "/opt/homebrew/opt/node@22/bin:\$PATH"

View File

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r26b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="34.0.0"
sdkBuildToolsVersion="35.0.1"
# this is compile sdk version
sdkApiLevel="android-34"
sdkApiLevel="android-35"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

View File

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r26b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="34.0.0"
sdkBuildToolsVersion="35.0.1"
# this is compile sdk version
sdkApiLevel="android-34"
sdkApiLevel="android-35"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

2
qt3d

Submodule qt3d updated: 853dc45ee2...bfad8d1ca7

2
qtbase

Submodule qtbase updated: f55ea3271b...c07c2d5a52

2
qtcoap

Submodule qtcoap updated: eb8fb6773d...4ca6138222

2
qtdoc

Submodule qtdoc updated: d4fd6fa937...5252bd9258

2
qtgrpc

Submodule qtgrpc updated: 6be8fc5b24...7a1193097d

2
qtmqtt

Submodule qtmqtt updated: 03f00e0a11...6a876cb321

Submodule qtopcua updated: be1c77c0ed...8c3494316b

Submodule qtscxml updated: d832f2d3e6...01b054ac35

2
qtsvg

Submodule qtsvg updated: 4422b48cb3...c75099a75e

Submodule qttools updated: feda5851dd...2649ea1aa5