CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v6.5.6-lts' into 6.5

Browse Source 
meta-qt6 v6.5.6-lts release

Change-Id: I91aeff943d1c5a944c5190da8c50e882877aaf0b
This commit is contained in:
Mikko Gronoff 2025-08-25 11:11:56 +03:00
commit faf9221ea2
7 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -22,9 +22,9 @@ the LAYERSERIES_COMPAT (c).
| Yocto \ Qt | 6.5 | 6.4 | 6.3 | 6.2 |
| ---------- |:---:|:---:|:---:|:---:|
| master | | | | |
| scarthgap | x | | | |
| nanbield | x | | | |
| mickledore | x | x | | |
| mickledore | c | x | | |
| langdale | c | x | | |
| kirkstone | x | x | x | x |
| honister | c | c | x | x |

6
coin/module_config.yaml
View File

@ -17,7 +17,7 @@ machine_type:
#
# [target1] [target2] [target3] [target4] [target5]
# [machine] qemuarm64 qemux86 qemuarm qemux86-64 qemuarm64
# [yocto] nanbield nanbield mickledore dunfell kirkstone
# [yocto] nanbield scarthgap scarthgap dunfell kirkstone
# [X11] no no yes yes no
# [mingw] no yes no no no
# [static] no no no no yes
@ -47,7 +47,7 @@ target2: &target2
variableValue: qemux86
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: nanbield.xml
variableValue: scarthgap.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs wayland mingw no-webengine lts
@ -63,7 +63,7 @@ target3: &target3
variableValue: qemuarm
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: mickledore.xml
variableValue: scarthgap.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs lts

2
conf/layer.conf
View File

@ -46,7 +46,7 @@ QT_GIT_PROJECT ?= "qt"
QT_GIT ?= "git://code.qt.io"
QT_GIT_PROTOCOL ?= "git"
QT_EDITION ?= "opensource"
QT_VERSION = "6.5.5"
QT_VERSION = "6.5.6"
QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"

92
recipes-qt/qt6/qt6-git.inc
View File

@ -16,53 +16,53 @@ PV = "${QT_VERSION}"
SRCREV = "${SRCREV_${QT_MODULE}}"
SRCREV_tqtc-qmlcompilerplus = "23844c4d7fc63d56d0ed204f21f9499cdb525a5e"
SRCREV_tqtc-qtinsighttracker = "52b7cff9ffc593dbef0df86734d138d7e9187a43"
SRCREV_tqtc-qtvncserver = "0860116e1e38d085f8bc902d91d4b0bcf72149de"
SRCREV_qt3d = "1363caf03949f5af3796000d8040bad24887addc"
SRCREV_tqtc-qmlcompilerplus = "83bf4928c1c356c5e0e804cb723db1c75e07aff7"
SRCREV_tqtc-qtinsighttracker = "34595fbd124db003a6179aee1b0a5ed4d02f5eb2"
SRCREV_tqtc-qtvncserver = "ed2b113e7ee83f0d3a53090f82da84676413bb4e"
SRCREV_qt3d = "b1d3dd19e8ac70a861edb5bd47011ce819aa1fae"
SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae"
SRCREV_qt5compat = "5fd890a06773f2da56a723603f63f98c1be5be0d"
SRCREV_qtbase = "c8c0c677693c047a9dbf94c2a88eb920ed11acc8"
SRCREV_qtapplicationmanager = "e9737957d3f3f5783506f6ce11ca540705dc79fe"
SRCREV_qtcharts = "12d3ba23063699dbd71d6ceafb9aad6e2d3f77f8"
SRCREV_qtcoap = "808045b951f3cdc12fef2428c4877c8f5e899c03"
SRCREV_qtconnectivity = "ae4a3828b37999e63fb3c7d0f2c2e5788512f098"
SRCREV_qtdatavis3d = "ec4bfb297e2945d3d1ab10ce31f96932a00f11df"
SRCREV_qtdeclarative = "1bdc78e942ff99f8cc8171a6d21237740a2ad9df"
SRCREV_qtdeviceutilities = "364a838634cede17b7e65650ac7718612e86ae10"
SRCREV_qtgrpc = "b24bb68d34489efc06db18778b562215f3436f65"
SRCREV_qthttpserver = "d93cc14bbcb46363947840fb5e8158d0c2e92429"
SRCREV_qtimageformats = "93317400471b1ef875471bfd719b00fe4fffc4fe"
SRCREV_qtinterfaceframework = "cfddbca409e52e1244d5bcd87949d9d8b502ea12"
SRCREV_qtlanguageserver = "a4240e7eea774e7cc3019e3f1bf3168fd76612bc"
SRCREV_qtlocation = "6ed2268c957b3bdebf7375c1fa3a4bd22ec9925e"
SRCREV_qtlottie = "a559509e6b6b3ef28fa86d918b5689892b5d1e4c"
SRCREV_qtmqtt = "f67b048d84703f12565df13616fb911499535c4c"
SRCREV_qtmultimedia = "6ba17e797c67ace011537fc94b119544c1015966"
SRCREV_qtnetworkauth = "0864c023e0ed940b0e2430c172e0ed7c035bae6c"
SRCREV_qtopcua = "ca0cfa64d23e5e30dec759f19c27092685a255c6"
SRCREV_qtpositioning = "66cd209b09a2ec3d9c597b6b45ca77513b48cf04"
SRCREV_qtquick3d = "fb2b8eda0259eb4f78db1d87332869cd49180d6f"
SRCREV_qt5compat = "27774c1d2058bdd951cfc827d52dc68dc811c9a2"
SRCREV_qtbase = "72e405b9079707c9c033864aa66d20221b54bb06"
SRCREV_qtapplicationmanager = "3f77fdaa83f7fc7db7427ffe37f445e91c8ee1be"
SRCREV_qtcharts = "29465c58b158b2200d6577d2cb6bb0e972154020"
SRCREV_qtcoap = "ebc6c174a59ba201e0467a206b5e543e94d30e8f"
SRCREV_qtconnectivity = "dd971dfb95970195d926371c8603d98d75a03d56"
SRCREV_qtdatavis3d = "c18392fd799eadc3110747b0fbb5fe843b3df402"
SRCREV_qtdeclarative = "0bbb1c4e12e7d027b452a946652049f353a41132"
SRCREV_qtdeviceutilities = "7502c8cb156a68b0576cf575a9a161cdade005a3"
SRCREV_qtgrpc = "ac96ecc6e70f8ac58a1949fa5a14c01c419ca32a"
SRCREV_qthttpserver = "cf82ce3bdfff366cf6be17da0da65d8131d6c258"
SRCREV_qtimageformats = "0fbd8beca9e19f73507d5d35be5a876600d2eff1"
SRCREV_qtinterfaceframework = "05c800b4d1a427843846f2de5a7e693dae5c4e08"
SRCREV_qtlanguageserver = "4d1dde2d72407f6e5f725efd6cee86951c006e19"
SRCREV_qtlocation = "2d4d23684110e251294798bd722d5e6dc32f6845"
SRCREV_qtlottie = "ef4f2a27a9a919e9b6a44c7f6999996a2b90d532"
SRCREV_qtmqtt = "21177fbcc2051a0d611ed0773b3d479c3a858dd2"
SRCREV_qtmultimedia = "d842fea8622aa8825ba42f1263c7aacc24ae5631"
SRCREV_qtnetworkauth = "dd69dcecf0122c5e677ba8dea869b340fec25fba"
SRCREV_qtopcua = "16208fbf20da782b101f87eeb897b984b2d492ad"
SRCREV_qtpositioning = "384e6155a739c96be5f07a29ac4953463405d960"
SRCREV_qtquick3d = "c8207abe652b4dbe3a7837e63f1be91980d36086"
SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0"
SRCREV_qtquick3dphysics = "6dab0079351fe3c3383f4f2957f424bc4a8d0242"
SRCREV_qtquickdesigner-components = "5f115ed120adb58972ac3a0a2b80ec42cf3769a1"
SRCREV_qtquicktimeline = "06943b384ddd2215640ed73af49fdc06fdef5ebc"
SRCREV_qtremoteobjects = "8e550853be4778d61f33bf6e4e791b69a7f40ca3"
SRCREV_qtscxml = "84bc3063254a7620ef7337275b8a21f9b1cdbe8e"
SRCREV_qtsensors = "c8ca070906d30a8acb511d5c916b76bbf9ee8301"
SRCREV_qtserialbus = "68276fa07cd33e45762f9748dcb6daa5164ea592"
SRCREV_qtserialport = "8e3bf7910de3a23e1074479e9f65bfc391901a5b"
SRCREV_qtshadertools = "8191dce7e16f9bf42476c41a3b7aab9a62b26daa"
SRCREV_qtspeech = "96c0eaacff876f719cc1dc420f1a3384fb9d9208"
SRCREV_qtsvg = "c9ca482a2876fb7d37717e5146eb37f7e26f03da"
SRCREV_qttools = "24d52c6d7f19794bfe61eba5097ada3100e225b5"
SRCREV_qtquick3dphysics = "bd8d13959258747dbdf615ba429a14570e13786d"
SRCREV_qtquickdesigner-components = "41eb62ef3f71a0c2c74de237cb0f5224a2cd94dc"
SRCREV_qtquicktimeline = "0e621d5fba45cd44138887d5418272fd7b7c4aa8"
SRCREV_qtremoteobjects = "d8bc0d7cc7a4ff131ec039f5b155973366ae15f0"
SRCREV_qtscxml = "bf53edfa0b3c8cb39ee6b27ff9edadf870a09f5a"
SRCREV_qtsensors = "7af391b9d397c7b1fb9ed7c68830df36aab34069"
SRCREV_qtserialbus = "a171818260beee933e32f6b19db2fa8b4244977e"
SRCREV_qtserialport = "ca366cc8d7f17a90cb303f6944b1ab9a7f1d62e2"
SRCREV_qtshadertools = "c7c5a2b27b093a1c697cb41013f8f05678649b50"
SRCREV_qtspeech = "7c0c3bff384d9a9c88c2c9b090f17ad9f61029de"
SRCREV_qtsvg = "56a861c1a67beab7f9f09340550def485468264e"
SRCREV_qttools = "b4920210050c18913531ac237f294e2632a2edda"
SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2"
SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737"
SRCREV_qttranslations = "87e5206b009df8467dbf568703e8a937e2734442"
SRCREV_qtvirtualkeyboard = "ebbc142a3e913e79fd8271c05f15325fa858f560"
SRCREV_qtwayland = "ec561c8b37422a8eb8aefdcc25a8929b6b78de54"
SRCREV_qtwebchannel = "bcabbf9bd1942d6bb59d30ea99c2ea2354a05797"
SRCREV_qtwebengine = "f08b503f680e8a6d4021d2fd21d2386f8e60da24"
SRCREV_qtwebengine-chromium = "707f4e7c0110c33df3d36a1942ad1b0ea2cb997b"
SRCREV_qtwebsockets = "a99a79ba396fc139497afe2f8531b2a35c62692e"
SRCREV_qtwebview = "e88d40fbd60e4f4c6c27bbfd5cfd161cb3eb4bdf"
SRCREV_qttranslations = "660d2ffc4be83838e45a03fb3d03384279fc7081"
SRCREV_qtvirtualkeyboard = "a4c4f67468edaea98be16ed338ef07c9c96833ca"
SRCREV_qtwayland = "78f6a3877fd20c68be1e00a8fe27f7a399ce95b8"
SRCREV_qtwebchannel = "951929518a183f9dd254603140a33be1fc9f35f6"
SRCREV_qtwebengine = "0efae85f199a61fd6919703cfbb74d680d9a9443"
SRCREV_qtwebengine-chromium = "be3ba7a0ebb340b9498e82c3506cf46ec5ddbee6"
SRCREV_qtwebsockets = "51cae79f950c11cca5609cda85a94e9553f44a31"
SRCREV_qtwebview = "3fbafefaa821bef27a5e04b5e0a3e30c98eb16af"

11
recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
View File

@ -1,4 +1,4 @@
From 1662965c5b1fd00fb61c3fc29833324999c0bfc2 Mon Sep 17 00:00:00 2001
From 4064b8757cbb28588fdff2529ea203bf3eabc579 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 26 Sep 2012 17:22:30 +0200
Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@ -15,18 +15,17 @@ Upstream-Status: Inappropriate [embedded specific]
Change-Id: I41595c6ce7514e8f197d0a19a1308c9460037d1b
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/corelib/global/qlibraryinfo.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 715bda488c..3e9314be86 100644
index 92729b06f1..dac7857600 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -92,7 +92,12 @@ static QSettings *findConfiguration()
if (QLibraryInfoPrivate::qtconfManualPath)
return new QSettings(*QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat);
@@ -101,7 +101,12 @@ static QSettings *findConfiguration()
if (qtconfManualPath)
return new QSettings(*qtconfManualPath, QSettings::IniFormat);
- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
+ QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");

4
recipes-qt/qt6/qtdatavis3d_git.bb
View File

@ -6,9 +6,11 @@ LIC_FILES_CHKSUM = " \
file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
"
inherit qt6-cmake
inherit qt6-cmake features_check
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
REQUIRED_DISTRO_FEATURES = "opengl"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

6
recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch
View File

@ -1,4 +1,4 @@
From 481452adfddf754b1ffaca53f484c366edc5a3f5 Mon Sep 17 00:00:00 2001
From 743bfbd8a9a11eb75234068c63e0b3f52e1a2823 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 29 Jan 2020 12:39:09 +0200
Subject: [PATCH] Allow qtwaylandscanner to be built without dependencies
@ -11,7 +11,7 @@ Upstream-Status: Inappropriate [OE Specific]
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6649dfcc..02f677b8 100644
index c498e15b..21fadd02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,11 +18,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
@ -27,7 +27,7 @@ index 6649dfcc..02f677b8 100644
Core
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c3219f9d..9886cb51 100644
index a38d9551..c4fe5fb1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,7 @@ endforeach()