Compare commits

...

217 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
8f00348c17 Update submodule refs on 'lts-6.5.7' in yocto/meta-qt6
Change-Id: I8f547c722425b1163e9f43e1b18984ef5eee5177
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-10-04 03:17:10 +00:00
Qt Submodule Update Bot
4a2defa149 Update submodule refs on 'lts-6.5.7' in yocto/meta-qt6
Change-Id: Id968c8658da43b891efad8217abf0780306b881b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-24 02:27:26 +00:00
Qt Submodule Update Bot
6238fc98ea Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ice353e5b890d254169867ce32481e0b936d803b6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-21 04:55:29 +00:00
Qt Submodule Update Bot
e158525317 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Id7af02e43d23761d45a755c5c383d3df87fac30f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-11 13:26:02 +00:00
Qt Submodule Update Bot
97c53d87d3 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I261a907d78aa4e57e108fde7ee8cbbab68c7a857
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-09 14:04:26 +00:00
Qt Submodule Update Bot
b447dd85a9 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ic7a70a68891df7dbebe7e37d8f57ae2292804f6d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-06 20:30:48 +00:00
Qt Submodule Update Bot
ae8115c5b3 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I8e7cb09e457155dc168f381be992e75744410ac3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-04 00:23:25 +00:00
Samuli Piippo
d233ec3ce2 qtwebengine: update to 118-based
Update QtWebEngine and QtPdf to use 118-based chromium.

Change-Id: I9a09b33156240ac8da850cf60984ba1986c5f474
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 4b105e589b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-08-28 09:16:16 +00:00
Qt Submodule Update Bot
2fe02b4c11 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I360309a351488df892ded27dd78a3498efde458b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-28 09:16:04 +00:00
Qt Submodule Update Bot
12c0d5359a Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ia82a121705350d95add5751179e6cf499396367b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-23 14:15:01 +00:00
Qt Submodule Update Bot
f2d5f039b9 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ic70b0be65a6ef877af77830ff1ca48144d976af4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-22 20:56:53 +00:00
Mikko Gronoff
a549a810c5 qmlcompilerplus: Update licenses
SPDX license changes were applied on the module.

Change-Id: I53f2d2d756330e24c9073dcaefae53c6ef8e3271
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit eeca91ef6c)
2024-08-21 06:05:13 +00:00
Qt Submodule Update Bot
650be318ea Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ia4c472ee41d5e0cc1440815d13fb7f9de22f4bb5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-21 06:04:56 +00:00
Mikko Gronoff
8eb975f21b python3-qface: update 2.0.4 -> 2.0.11
Required for latest qtinterfaceframework. Fixes build issue:

"/home/qt/work/build/build/tmp/work/core2-64-poky-linux/qtinterfaceframework/6.5.7-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/qface/utils.py", line 22, in load_filters
|     exec(path.text(), ctx)
| AttributeError: 'PosixPath' object has no attribute 'text'"

Pick-to: 6.2
Change-Id: I9a407553f7546344a49020b8ebf04540a73fbf0c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-08-19 05:54:53 +00:00
Qt Submodule Update Bot
d1b52d72e6 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ic8a2d059ff6ad53ab101d1f1367c056331a67708
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-19 08:54:44 +03:00
Qt Submodule Update Bot
5c2a676a4f Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Icae2198ad99fa7953b5cefc500cb5f8be2ca2261
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-02 16:49:20 +00:00
Qt Submodule Update Bot
771bb06b81 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I9c4bd3150c63874b658b71344fca6b0cf3872738
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-31 13:35:43 +00:00
Qt Submodule Update Bot
720b4ef8ce Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I9c1ddae575eddef7db46cb145cfb0fdebb7d5ba2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-29 12:40:49 +00:00
Qt Submodule Update Bot
ea67b56be4 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Id14ca831d801e65cb12bce23f0fed2b5849a5bf1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-25 17:12:51 +00:00
Qt Submodule Update Bot
8a4fea85dc Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ib636825a1934debc7fcc7d3730d273f5cce1b3f0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-23 13:05:18 +00:00
Qt Submodule Update Bot
0d22193e77 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ib7884f171ea0272d3098062c722ec8e2629f39d6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-18 23:18:46 +00:00
Qt Submodule Update Bot
b9ae5c662d Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I343851dc9999b77e2b09595e09eb16ad54e85f94
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-05 12:13:01 +00:00
Qt Submodule Update Bot
29cf0a46fb Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Iac5a4cff59dbd368b0c258c3ed352ae5a0998c38
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-03 13:01:20 +00:00
Qt Submodule Update Bot
c74178ca25 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I4ca5131294ca961648f1a479143f38d830183cc2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-01 20:31:38 +00:00
Qt Submodule Update Bot
35e79509ea Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ie1374c8915fa3af33f9dfdff3f95700a71512310
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-27 02:45:28 +00:00
Qt Submodule Update Bot
072e800af3 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I01df09fae52c59161c6f6951427cd7c11473514c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-25 13:01:05 +00:00
Qt Submodule Update Bot
f2fb02cb0a Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I7a88ed7e902290976c3802a43c5217255f2d018e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-19 03:39:32 +00:00
Qt Submodule Update Bot
c1dd8454ca Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ibd0cc8911bbd9b09f3954d94f0757ecc6c6aef14
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-07 20:26:58 +00:00
Qt Submodule Update Bot
35d50501e9 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I65a5467126dba6ca4149c9c75cd7bf72f353982f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-05 18:50:31 +00:00
Qt Submodule Update Bot
dcbfe0984c Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I8199f8056cd9beae40f3d5789ee6f4fe9caec9af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-03 04:53:09 +00:00
Qt Submodule Update Bot
101d73cc5e Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I05377ca4e27211dca92ce78d65d16bf78552e959
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-20 13:49:36 +00:00
Qt Submodule Update Bot
0db135ebea Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I7ee2f24de567ed8f7f4a94e0d766a9c1983f556d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-16 05:36:22 +00:00
Mikko Gronoff
698d9ad0f0 Bump version to 6.5.7
Change-Id: I162f3a1246e95d15c771e40bdd2afe3bebba800c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-05-14 09:29:38 +03:00
Qt Submodule Update Bot
85625e6475 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ib7803630f070f4ecd9fac5744db0c42d6c990c8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-03 12:55:58 +00:00
Qt Submodule Update Bot
1cd36b65f0 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: If538e5028d251e7554dbc4d70d87fd5c4828667b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-02 02:44:49 +00:00
Qt Submodule Update Bot
192a1cb88a Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ibd477b30cb0c70accc92d5de11f2ad91b7cfa1d2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-27 04:51:23 +00:00
Mikko Gronoff
2f84b2652b qtwayland: fix patch fuzz
Change-Id: I37700a20205d9a5596d1270ec98d404f6a655f3e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 89bf14b9c7)
2024-04-22 13:51:29 +03:00
Qt Submodule Update Bot
7309307403 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ib23ab6385aae177c3e2e7c723580a60a517ea378
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-22 10:50:32 +00:00
Qt Submodule Update Bot
095c6166d4 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Iab3f0fa33b219bc85a3d5fe9c367a1c58849c962
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-16 13:19:53 +00:00
Qt Submodule Update Bot
e3458a4757 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I6bc24ae927e38c2f7bd8dbc41cb9b91ff831da40
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-11 22:47:33 +00:00
Samuli Piippo
0ff1596737 coin: switch builds to scarthgap
Drop master and mickledore builds from testing. Master is now
future 'styhead' which is no longer supported with 6.5 series.
Mickledore is EOL, no need to test againt that anymore.

Change-Id: I603b9777cb147c0285b8f26e34a730d36b45490b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-04-11 08:59:11 +03:00
Mikko Gronoff
f7808792e9 qtwayland: fix patch fuzz
Change-Id: I1f475af29ecdb3da5fa56b2549bc384ff040739d
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-03-27 09:31:40 +02:00
Qt Submodule Update Bot
a0c163c37c Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ib4e5e2b91cdc7afd5ab3c39de6c76783f7c7a998
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-27 07:31:17 +00:00
Qt Submodule Update Bot
1cdc7f5bbc Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I95b6f515153a822e22d447b5526e78777e1139c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-22 20:03:49 +00:00
Ari Parkkila
d72e2e5a20 qtdatavis3d: add feature_check for opengl
Co-authored-by: Sakib Sajal
Fixes: QTBUG-114912
Change-Id: Idfea16557eb4f068b9cb67412bd1dba0df966a20
Reviewed-by: Jari Helaakoski <jari.helaakoski@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 600f22c4a1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 056f9d41d2)
(cherry picked from commit 92019beed2)
2024-03-22 07:56:59 +00:00
Qt Submodule Update Bot
880f52ba78 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ifee358651c6391b02452a887afbb6d5bec91a788
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-21 12:00:58 +00:00
Mikko Gronoff
9fa1a180c2 qtbase: fix patch fuzz
Change-Id: I286a9e70eb7e4a57f9398dc88dd61aaff90a9aea
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 64d0ebee63)
2024-03-19 07:24:22 +00:00
Qt Submodule Update Bot
5878c168b3 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ib839aa20191cea84046f28b649ce56d83b9b335a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-19 07:24:21 +00:00
Mikko Gronoff
fa45b18f3b Bump version to 6.5.6
Change-Id: I2715c0f67358e7e5007ffaa7d9599042dcf330be
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-02-20 12:39:25 +02:00
Mikko Gronoff
db212391c0 webengine: update patch
Change-Id: I2c9df3bde7b0c6776cfd3a32093047fad1bd7256
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 7e80a1296c)
2024-02-16 10:25:23 +02:00
Qt Submodule Update Bot
52920bf035 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I27f465776da1770fe0e2978de6e19ec96da468be
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-16 08:25:18 +00:00
Samuli Piippo
27b9741330 qtbase: prefer system png
Update PACKAGECONFIG[png] to make sure we use the system libpng
as expected.

Fixes: QTBUG-121795
Change-Id: I051a9a40a9a7bfd001b77c51db9eab2b19147efb
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit b8a440f310)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0929fe9236)
(cherry picked from commit de18ee079e)
2024-02-14 09:20:26 +00:00
Samuli Piippo
324fefb8f5 packagegroup: add Qt modules only on supported archs
QtQuick3dPhysics, QtPdf and QtWebengine have limited
architecture support.

Change-Id: Icf1d7628de5365825c79030462f019b15d9ae9a0
Reviewed-by: Alex Bu <alex.bu@qt.io>
(cherry picked from commit a18047ef52)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 498e94c913)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 5167e03636)
2024-02-14 09:20:26 +00:00
Samuli Piippo
dcc708cbfc layer.conf: update LAYERSERIES_COMPAT for scarthgap
oe-core as switched to scarthgap

Change-Id: Ica326b8be4a23a5b6a52667a98740720185a6f73
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 3c24d5dfd2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0c80b6fb04)
(cherry picked from commit b18288a195)
2024-02-13 13:54:56 +00:00
Mikko Gronoff
a2fba23749 qtwebengine: update a patch & chromium branch
* Fix patch fuzz for 0001-CMake-use-generated-yocto-toolchains.patch
  with latest submodule update.
* Webengine chromium branch updated 108->112.

Change-Id: I4750de02226067a2541a6ad058163fa66ad88c96
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-02-13 09:09:56 +02:00
Qt Submodule Update Bot
1890fa16b2 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ib451eb15165fbe962d1cd3808a837c09f6c86555
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-13 07:09:42 +00:00
Samuli Piippo
96ac5e67ef packagegroup: fix warning caused by inherit_defer
Yocto scarthgap is now using inherit_defer which causes allarch
to be inherited last, when nativesdk wants to always be the last one.
Workaround this by setting PACKAGE_ARCH to empty, which causes the
allarch inherit to be skipped. PACKAGE_ARCH will still end up being
the same value, as packagegroup will set it correctly.

Fixes QA Issue: nativesdk-packagegroup-qt6-toolchain-host: native/nativesdk
class is not inherited last, this can result in unexpected behaviour.

Change-Id: I0457a62333d88b14c3330e3349f585dc6c3eec35
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8d3758ce9e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit fb6eea5204)
(cherry picked from commit b1a6059e18)
2024-02-01 18:35:29 +00:00
Qt Submodule Update Bot
4050be207a Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ibf0793c6d4aeb4b8d46c979e33d7773b35934a68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-01-28 19:47:16 +00:00
Mikko Gronoff
1bab03265b Bump version to 6.5.5
Change-Id: I4414898437c2116e9b39e6751ef6460d217271b0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-01-11 09:07:17 +02:00
Qt Submodule Update Bot
085bb0eb93 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ie5ffecdd7c73aad7f65cb760e1eb56d0dfc1ac0b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-12 16:32:27 +00:00
Samuli Piippo
2a2ae7c5eb qtbase: fix QLibraryInfo prefix with usrmerge
If Qt is configured to use 'relocatable' feature, QLibraryInfo will
at runtime try to determine its prefix path. If distro is using
usrmerge, Qt libraries are found from '/lib' before '/usr/lib' causing
Qt to use wrong prefix '/' when Qt was configure with '/usr' prefix.

With Yocto builds, we have no need for the relocatable feature,
disable it to avoid issues in usrmerge distros.

Fixes: QTBUG-119140
Change-Id: Ied2ca04b5d46cff5d4bed1c456e95235156c58f0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 5cfc35d4f0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit ebb07490da)
2023-11-30 19:39:00 +00:00
Samuli Piippo
670c1e5afc qt3d: remove upstreamed patch
Assimp is now updated to version that has the patch applied.

Change-Id: Ib33974d44ada36f79d73f81689fb91cd6d94a355
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ac54355589)
(cherry picked from commit 4945d1e994)
2023-11-29 08:01:31 +00:00
Qt Submodule Update Bot
5a722c7275 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I64735c92c1d8c4d8f3e13c6536f6a80e309c6248
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-29 08:01:23 +00:00
Samuli Piippo
d56a1afa06 ptest: better ptest support
Make run-ptest script correctly log passed and failed tests.
Set env variables to make more tests pass correctly.

Change-Id: I3c23a0a093b396df6b88aedc51a15a871f1ba9e9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 097cfd9d54)
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 842884802e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-11-28 17:50:21 +00:00
Qt Submodule Update Bot
93ef3fc9ce Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ifb464e84216300ce6a5a84e59d8186d3c5e02a0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-25 07:48:48 +00:00
Qt Submodule Update Bot
bf5089ec4f Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I841fbbf118f6daeab2065bfb870da82be624a998
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-21 17:00:02 +00:00
Qt Submodule Update Bot
a163a89da8 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I8624dd17bc2b902d3ee1f5987869822027362428
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-20 16:03:55 +00:00
Qt Submodule Update Bot
e9d8dcd1ad Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: I9a23407e82938a53537f5d0c46c69a68694326f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-18 09:12:15 +00:00
Samuli Piippo
5a99320f43 qmlcompiler: enable ptest
Issues resolved and the tests can be enabled.

Change-Id: I8c8c0ad8b9864589ed4248a9157159bb55d26407
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 3dc62ec47b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 635405045c)
2023-11-17 23:48:02 +00:00
Samuli Piippo
dbf732e054 qtwebengine: enable ptest
Issues resolved and the tests can be enabled.

Change-Id: I052259b23b9836e84faa07be9123078b5bdb7d2d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit c5d2c93ba1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit afa2639371)
2023-11-17 23:48:02 +00:00
Samuli Piippo
10e256ca63 qtconnectivity: enable ptest
Issues resolved and the tests can be enabled.

Change-Id: Ia50bf85c006fef63a65762bd37204f86299e7bf9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 51bd35a9f9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 572aa2ea9c)
2023-11-17 23:48:02 +00:00
Samuli Piippo
f1e9e2068f coin: add CI build for nanbield
Add separate build for nanbield. Update readme for the supported
branches. Next Yocto release (scarthgap) will be LTS relase,
aim to support it from Qt 6.5 upwards.

Change-Id: I37141b4d2a93fc6b276de906dbb7ba60b2733c41
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 550194a77a)
(cherry picked from commit 37aefee595)
2023-11-17 07:52:41 +00:00
Qt Submodule Update Bot
a39193a4a8 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ia693dde1c23b67db570b95bf97539a76b876797a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-16 10:52:50 +00:00
Samuli Piippo
d8e05d43de Revert "protobuf: add workaround for qtgrpc"
This reverts commit f00bd7134e.
Fix has been merged to meta-openembedded

Fixes: QTBUG-118868
Change-Id: I2d5f03d49e48605dad2bbc0b0c6885fe3f73ef75
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 44f08284c7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 334ee20756)
2023-11-15 22:42:17 +00:00
Michal Klocek
fc48fa6316 Remove old patches from qtwebengine
The workaround for long rsp file is an old patch
from qt5 times, which should not be needed in qt6
as used toolchains are in-source, therefore created
toolchain labels and later rsp files should not embedded
absolute paths, but simply use 'build/toolchain/yocto'
as this is a location of yocto toochain with-in source
tree.

The second patch is fixed in 112-based in 29354c7c7de.

Task-number: QTBUG-59769
Change-Id: I94a610c4562463f5de3f8bbb29915e05cf40e640
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit bdbb28f362)
2023-11-13 05:50:56 +02:00
Qt Submodule Update Bot
0dfe159d49 Update submodule refs on 'lts-6.5' in yocto/meta-qt6
Change-Id: Ibd23f0304309529fc26c01647b03d9e1fc1fb2cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-13 03:50:55 +00:00
Samuli Piippo
439818c518 protobuf: add workaround for qtgrpc
If protoc is enabled for the build, recipes using protobuf will
fail when protoc is not available in the recipe sysroot:

|   The imported target "protobuf::protoc" references the file
|
|      ".../recipe-sysroot/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/bin/protoc-3.21.5.0"
|
|   but this file does not exist.  Possible reasons include:
|
|   * The file was deleted, renamed, or moved to another location.
|
|   * An install or uninstall procedure did not complete successfully.
|
|   * The installation package was faulty and contained
|
|      ".../recipe-sysroot/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/lib/cmake/protobuf/protobuf-targets.cmake"
|
|   but not all the files it references.

Use SYSROOT_DIRS to stage the binary to sysroot so it's always
available for other recipes.

Change-Id: I588c54d0459dbb88bc080e8bf55902e851a0a1d8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit f00bd7134e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 83b545285b)
2023-11-07 03:08:01 +00:00
Mikko Gronoff
67eeece339 qt6: switch to commercial-only LTS repos and branches
6.5 enters LTS phase.

Change-Id: I09d479153a75489de12a877fbfa5cc2f1ec4ea07
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-24 20:19:46 +03:00
Mikko Gronoff
8e9598a200 Update Qt branch in qt6-commercial.inc
Use lts branch.

Change-Id: Ib1637649b1778df3cfa50b716affb860c449d44b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-24 20:19:31 +03:00
Tarja Sundqvist
d2024c743a Merge branch '6.5' into lts-6.5
Change-Id: I69f91bc71fc7deb6271aaaa1f8465ddeea6ba754
2023-10-20 15:38:31 +03:00
Samuli Piippo
d244b9de47 Workaround too eager packagegroup sanity check
Amend 95fa269ffa and add same workaround
also for the commercial packagegroup to prevent QA error: "An allarch
packagegroup shouldn't depend on packages which are dynamically renamed."

Change-Id: I6eaee9aa74681cfb70fb738d966cd7381f4bcdb0
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
(cherry picked from commit 511db28072)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 3b9ed8a29d)
2023-10-19 19:54:33 +00:00
Samuli Piippo
2e751503e1 Remove checks for required meta layers
Since meta-openembedded and meta-python are now dependencies,
we can simplify some of the recipes that were checking if the
layers were available. Now always use the features available
from those layers.

Change-Id: Ia70658e0c64b916c9d36ad9aca4c40172b86b5b6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit bc1179c5a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit c619e94c9b)
2023-10-19 08:52:55 +03:00
Martin Jansa
ac364d2ba0 layer.conf: fix LAYERDEPENDS_qt6-layer
* qtgrpc depends on protobuf from meta-oe:

  ERROR: Nothing PROVIDES 'protobuf-native' (but /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtgrpc_git.bb DEPENDS on or otherwise requires it). Close matches:
    popt-native
    xcb-proto-native
    xorgproto-native
  ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
  Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'qtgrpc', 'protobuf-native']

* and qtpdf, qtwebengine depend python3-html5lib-native on from meta-python:

  ERROR: Nothing PROVIDES 'python3-html5lib-native' (but /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtpdf_git.bb, /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtwebengine_git.bb DEPENDS on or otherwise requires it). Close matches:
    python3-toml-native
    python3-tomli-native
    python3-urllib3-native
  ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
  Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'qtpdf', 'python3-html5lib-native']

Change-Id: I616e03e3a259e532e4ccd6ec87a2975c063837fc
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 2713f52a6f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6270297ae7)
2023-10-19 02:35:36 +00:00
Samuli Piippo
a65fb409f4 qtbase: add PACKAGECONFIG for egldevice platform plugin
The eglfs EglDevice platform plugin is used only in NVIDIA boards.
Add separate PACKAGECONFIG so it can be disabled by default,
otherwise it gets built whenever kms is enabled.

Change-Id: I98b56f4ff1c9dc04a0c0df3ab51f908608c52fbd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 4b5f7744d4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit cc229bfa36)
2023-10-13 03:05:36 +00:00
Qt Submodule Update Bot
9956c22975 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I683321411dc633204d2381b6b8989194bcf70717
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-12 20:12:11 +00:00
Qt Submodule Update Bot
5f1e6daeb5 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I5a408965c32d0a1995603c90413b4e8d454964b6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-11 10:15:39 +00:00
Qt Submodule Update Bot
0af28727f6 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I1e0908c8d02847d936caa93a5277aea80658d87e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-09 17:42:48 +00:00
Qt Submodule Update Bot
b5db4aaec6 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I91b4acd380393b8ddb07ac443cbefab02b685435
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-05 19:49:01 +00:00
Qt Submodule Update Bot
c9facd2e3f Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I28ad2f4aecbcfdc196c6ec9917c2a11b68c04a09
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-04 20:04:31 +00:00
Andreas Cord-Landwehr
dbd7212af8 qtbase: add at-spi2-core as dependency for accessibility option
Without at-spi2-core the SPI bridge API is not being built.

Change-Id: I49232f933b96597fba721473dd7dcf894d60d9cd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 806a39f3ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit a50132b5da)
2023-10-03 00:48:38 +00:00
Samuli Piippo
fb57418246 readme: Add link to bug tracker
Change-Id: Ida7529550d0ef2d816f86d82c1feaa581e0b624f
Reviewed-by: Inkamari Harjula <inkamari.harjula@qt.io>
(cherry picked from commit 0f91287175)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit cc05190dfa)
2023-10-03 00:48:38 +00:00
Samuli Piippo
ca7ea007dd qtmultimedia: enable ffmpeg only if its license is accepted
QtMultimedia can use FFmpeg, but it has has somewhat problematic license
and user must accept it before it can be built. Enable FFmpeg backend
by default only if the license has been accepted in LICENSE_FLAGS_ACCEPTED.

Change-Id: If23ee18fa7ac7f92f58bf9d09d8e96aedd08b625
Reviewed-by: Inkamari Harjula <inkamari.harjula@qt.io>
(cherry picked from commit 98eb819c18)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1ba070272e)
2023-10-03 00:48:38 +00:00
Qt Submodule Update Bot
4ff33bb537 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I479f1688f6829671e9de89f129c5502da7fc554d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-27 14:54:49 +00:00
Mikko Gronoff
a576b65a2e Bump version to 6.5.4
Change-Id: I5ec64b7837f5ec0dc82f5848f8a3d17c162453d1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-09-25 10:49:03 +03:00
Qt Submodule Update Bot
9f7c4f54a5 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I3385077aa0cd0ae7d38c230ab5e4c66ffe6d4fa1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-22 19:08:11 +00:00
Qt Submodule Update Bot
4afbf02d01 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I46f9242e4aeb3189701cb25b9095e4f85287f9b9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-21 15:28:55 +00:00
Qt Submodule Update Bot
957fcd255c Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I78fabe7212db47f78a67db8184dd49d250a56c34
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-19 22:17:31 +00:00
Qt Submodule Update Bot
506b75c635 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I22f2223fa30fb53f4e1804c6129ef3996f6e2047
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-18 17:35:06 +00:00
Qt Submodule Update Bot
54376fa4f4 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I0d0d517e1db558c362aadbe7fcd7fea6efacc9ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-15 05:50:25 +00:00
Qt Submodule Update Bot
c0bf48fb5d Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I290c1a783fc015865198403d78ec534598d48128
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-13 03:53:45 +00:00
Samuli Piippo
d20c573026 layer.conf: update LAYERSERIES_COMPAT for nanbield
oe-core as switched to nanbield.

Change-Id: Iebc445cea81d1449f0564f036787c44ba6aa8a87
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 6c221de4fb)
(cherry picked from commit 4517131d2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-12 08:48:07 +00:00
Qt Submodule Update Bot
8cb28eada2 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I649de968a4816b9c6b2059e8b3579cc2074bce8b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-11 09:05:35 +00:00
Qt Submodule Update Bot
f278379eef Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ie8a863e732d0cdcae981f55fd9fd46f8d9421105
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-05 09:48:30 +00:00
Qt Submodule Update Bot
fa1cb9b39b Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I87445a73a09e46966cb6f8a5520dc6d41d2a9c46
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-01 22:10:48 +00:00
Qt Submodule Update Bot
6b0dfab4fc Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I84d0769711be6efbfe6617b24ba035825025c2c3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-31 02:18:03 +00:00
Jaeyoon Jung
fe0971f78c qtshadertools: Fix missing dependency to spirv-tools
qsb needs spirv-tools when -O flag is given, but it is not pulled in
recipe-sysroot-native due to missing dependency. It causes qsb files
are not created as output. Errors like below can be seen with a small
tweak that makes qsb run with no -s flag.

[1/218] cd /home/noelma/work/webos/build-webos/BUILD/work/x86_64-linux/qtdeclarative-native/6.7.0-r0/build/src/quick && /home/noelma/work/webos/build-webos/BUILD/work/x86_64-linux/qtdeclarative-native/6.7.0-r0/recipe-sysroot-native/usr/bin/qsb --glsl 100es,120,150 --hlsl 50 --msl 12 -b -O -o /home/noelma/work/webos/build-webos/BUILD/work/x86_64-linux/qtdeclarative-native/6.7.0-r0/build/src/quick/.qsb/scenegraph/shaders_ng/8bittextmask.frag.qsb /home/noelma/work/webos/build-webos/BUILD/work/x86_64-linux/qtdeclarative-native/6.7.0-r0/git/src/quick/scenegraph/shaders_ng/8bittextmask.frag
spirv-opt -O /tmp/qsb-XOAphY/qsb_spv_temp -o /tmp/qsb-XOAphY/qsb_spv_temp_out
Failed to run spirv-opt -O /tmp/qsb-XOAphY/qsb_spv_temp -o /tmp/qsb-XOAphY/qsb_spv_temp_out: Child process set up failed: execve: No such file or directory

Change-Id: I49c88711be4ca09425fa71f8ce8eda88256370f6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 7c2a20a1c5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-30 14:38:00 +00:00
Samuli Piippo
ffe38b4b55 qtbase: fix install if lcl_maybe_fortify is empty
lcl_maybe_fortify might be empty, which would make sed fail during
do_install. Workaround this by adding space to the substitution
pattern.

Fixes: QTBUG-115588
Change-Id: Ic6c5a6c80011dfefc92e1b2d7aadc48cce82ed7a
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit deab0703da)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-28 18:20:29 +00:00
Qt Submodule Update Bot
87f598e4ba Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I9fed6c90755464fb5637d3962f948a65f3869825
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-28 14:19:03 +00:00
Qt Submodule Update Bot
f086ba11b3 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ie47017a6803a14898b76e2670156347737506b1b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-25 17:57:38 +00:00
Qt Submodule Update Bot
472b422afa Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Iba16805bcc866bc7456b44a147bc5f724a370ddd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-24 13:16:56 +00:00
Qt Submodule Update Bot
9769c1f604 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I0ae1c08f5aa61d93907893f4642e51db75201115
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-23 19:40:34 +00:00
Samuli Piippo
708effa7e1 qtwebengine: fix x86_64 build of ffmpeg
Backport fix from oe-core/ffmpeg.

Change-Id: Id1fec1ef32f3ce8233c57a6caab18457ca3f8a72
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit fef57b1545)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-23 11:21:01 +00:00
Samuli Piippo
884a605da7 coin: remove langdale from CI tests
Langdale is now EOL, stop testing Qt against it.

Change-Id: Idba5e353ef3ec484e088fe831ed59f54d70b3acf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 30dfd502b3)
2023-08-23 12:12:13 +03:00
Qt Submodule Update Bot
5fe05be024 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I020752e3e7b438c3ec8cf2e0281992276d46dc93
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-22 21:04:53 +00:00
Samuli Piippo
068edb4b69 coin: add workaround for QA warning on qemu
QEMU has QA warning on runtime dependencies which breaks
our CI build since they are treated as errors.

Change-Id: I1f2699d62d556b538da85aa12d8c2ec91483fb0b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 12f78361ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-21 21:10:51 +00:00
Qt Submodule Update Bot
2112ff88d0 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I31deb5143dc499bdf72bd511180e3237617b0d37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-21 21:10:50 +00:00
Samuli Piippo
bc8341ef8d coin: use INIT_MANAGER to select systemd
Yocto has INIT_MANAGER variable that can be used to select
the init manager. Use it instead of doing all to separate
changes ourselves.

Change-Id: I8aa31de9116048628a55d630ed3296fac28dfec8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 90226dfc47)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-21 21:10:48 +00:00
Samuli Piippo
1d401fed85 examples: add runtime dependency to main package
If examples are only using QML modules, the package manager won't
add automatic dependency to either the main or -qmlplugins packages,
and those might not get installed to the image. Add the runtime
dependency explicitly for the examples package.

Fixes: QTBUG-115310
Change-Id: I5b713d3a65f794da1ab0113cf1d7f69035e29288
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit c0318a6ad8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-15 16:10:26 +00:00
Samuli Piippo
87e5138a5a readme: add note about release branches and tags
Fixes: QTBUG-114723
Change-Id: I2f6b4ce365b53ec7bd96555c0d6fcbea0e7e50cd
Reviewed-by: <inkamari.harjula@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 21beafaf82)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-15 16:10:26 +00:00
Samuli Piippo
03dfbfe45b qtshadertools: add runtime dependency to spirv-tools
Add runtime dependency to spirv-tools as the qsb utility can use
spirv-opt at runtime. Cannot include it for mingw32 toolchain
as compilation fails.

To support dunfell, add BBCLASSEXTEND append to the spirv-tools.

Fixes: QTBUG-113210
Change-Id: Icce264b1f2bff5f56cf2b40a0420c5001493e236
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 69a8018ec1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-15 16:10:26 +00:00
Martin Jansa
9758d34538 *.patch: add Upstream-Status to all patches
There is new patch-status QA check in oe-core:
https://git.openembedded.org/openembedded-core/commit/?id=76a685bfcf927593eac67157762a53259089ea8a

Change-Id: I2da4efd9736cccb73f8f5fa40ff4fd4c973183c5
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit d65dc4592b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-15 07:31:04 +00:00
Qt Submodule Update Bot
7da90450d2 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Idcc574946776a88e3f24e3107d70f67fe26e3f02
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-12 03:39:38 +00:00
Qt Submodule Update Bot
86bbfcb5ba Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ia9e5de59f95cfb96f53a021a52f672e935bb0d8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-04 13:12:54 +00:00
Qt Submodule Update Bot
fdb06f7eb5 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ib8f24da2045d9858871431ff970a6f32ecdf4de1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-03 00:42:01 +00:00
Qt Submodule Update Bot
4df8b4c437 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: If8cbde8eab78ea8d3979256365c3947dded14cf6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-28 18:18:11 +00:00
Qt Submodule Update Bot
697c103df9 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I25b7ce657afc69437ce7d77661bfb21be28ae4cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-22 15:50:55 +00:00
Samuli Piippo
f89304ed99 Bump version to 6.5.3
Change-Id: I4bb6abd5e4e772f01c0b92dc35de8517ec231155
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-06-21 15:39:18 +03:00
Paul Geurts
7d4bcb39fa Remove legacy license identifier mappings in layer config
The layer configuration uses SPDXLICENSEMAP to change GPL-3.0-only to
GPL-3.0 (and other maps). Inluding meta-qt6 results in _all_
GPL-3.0-only licensed packages to be changed to GPL-3.0. As a result,
setting

INCOMPATIBLE_LICENSE += "GPL-3.0* LGPL-3.0* AGPL-3.0*"

does not filter out GPL-3.0-only packages anymore. This means
GPL-3.0-only packages still land in the target image. Adding GPL-3.0 to
the INCOMPATIBLE_LICENSE settings is not allowed, as Yocto has
deprecated these licenses.

This removes these license mappings so the incompatible license filter
is restored.

Change-Id: I5d1c13764bd034f5a20ea0cf3b6d98f1d29244d7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit c677a9e91e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-15 17:42:26 +00:00
Samuli Piippo
802bf7fb29 qttools: add PACKAGECONFIG for clang dependency
QDoc depends on libclang and using clang toolchain causes build error:
| CMake Error at qttools/6.6.0-r0/recipe-sysroot/usr/lib/cmake/Qt6/QtToolHelpers.cmake:623 (message):
|   Failed to find the host tool "Qt6::qdoc".  It is part of the Qt6ToolsTools
|   package, but the package did not contain the tool.  Make sure that the host
|   module Tools was built with all features enabled (no explicitly disabled
|   tools).
because libclang was found for qttools-native, but not for the target.

Add PACKAGECONFIG that can be enabled when using clang toolchain
if there is need for the qdoc, but otherwise keep it disabled.

Change-Id: Idc4e35936511ef0c208d7e8fd6f8fc51f3f8a1e2
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4729a37e36)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-08 17:52:26 +00:00
Qt Submodule Update Bot
945e7e5577 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: If228472871bbd1c54d9e4e38e3762579cef7b9b4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-06 19:58:45 +00:00
Samuli Piippo
9a5ff45a07 qtwebengine: update patch
Update patch to make it apply again.

Change-Id: I23d561af765a119df24ab1cfcd0171bdb99ffa12
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-05-30 05:49:41 +00:00
Samuli Piippo
1f3a789e7f qtwayland: update patch
Fuzz detected.

Change-Id: I422205975b9d6acfa67c238bf27fe334fb678727
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 30f672a28d)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-05-30 05:49:40 +00:00
Qt Submodule Update Bot
6c89153ef7 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I5bc4ed3b02a74fadc3ffab152bb01617994a9abd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-30 05:49:39 +00:00
Samuli Piippo
641dff9f2a qtbase: add PACKAGECONFIGs for different linkers
Add PACKAGECONFIG options for gold and bfd linkers so that they can
be easily changed independently of the ld-is-gold DISTRO_FEATURE.

For CI builds, drop ld-is-gold feature and instead enable gold only
for Qt modules.

Change-Id: I63e3835f15c732f57740b6718245e4f45ddb6c8c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8f67afff3f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-29 19:06:08 +00:00
Samuli Piippo
c1c635ffd2 Coin: use correct path for mirror
Change-Id: I878122ac5a34aaf464bb4190e3307793c53eabba
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 651610f42f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-29 08:49:10 +00:00
Samuli Piippo
f4209f700e qtbase: add runtime dependency to C.UTF-8 locale
Qt expects to have UTF-8 locale available. If the current locale
is not UTF-8, Qt will try to use C.UTF-8 locale. Make that available
by adding RRECOMMENDS to locale-base-c package.

Task-number: QTBUG-113371
Change-Id: I48f18488413168afbeffddb9eac58985d1b8a988
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 6ad68945b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-29 08:49:09 +00:00
Martin Jansa
5eec030c70 qt3d: Backport assimp fix for build with gcc-13
* fixes:
  http://errors.yoctoproject.org/Errors/Details/704200/

  qt3d/6.5.0-r0/git/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp:475:61: error: 'uint32_t' is not a member of 'std'; did you mean 'wint_t'?
    475 |         if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
        |                                                             ^~~~~~~~
        |                                                             wint_t

Change-Id: I503f18ae93a24fe08b66827b4ab2dc5b7562819a
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit e1cacf710f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-25 05:46:53 +00:00
Olaf Mandel
df63c7c981 Remove hard dependency on meta-python
Set up the BBFILES_DYNAMIC variable to include meta-python and move all
python recipes to the corresponding dynamic-layers directory. This
prevents failures to parse recipes if meta-python is not available.

Fixes: QTBUG-113712
Change-Id: If26668e8d901c89be8527ff3951a00d739a89372
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 16c7da9d10)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-25 05:46:53 +00:00
Qt Submodule Update Bot
2193526357 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I7f4b799d8b49f78648304ac7ecba8e2c36189fa3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-22 16:47:40 +00:00
Qt Submodule Update Bot
4099aecc7d Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I8537e385466f6b706b5fe5ac5b478e8566bed60b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-19 14:36:29 +00:00
Samuli Piippo
377e4386c5 qtvncserver: add PACKAGECONFIG to enable password protection
If LibTomCrypt is available, Qt VNC Server will be built with support
for password protection using DEC Authentication.

Change-Id: Id866d1facbbff0a50c39fe2e440e64e3cca8a579
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 6777ad5f22)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-19 10:45:45 +00:00
Qt Submodule Update Bot
cb231ab534 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I24b560444fd4a97f7f7c3678a62d74eb15f318aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-18 12:56:04 +00:00
Qt Submodule Update Bot
24cbbd72ec Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ib4fb588cc664e74026cdb0218965ab033894ee85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-15 09:11:40 +00:00
Qt Submodule Update Bot
e77081ae8e Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I600d74f19778dfc9a32a805ac7a8f04dfb7e4027
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-12 21:41:54 +00:00
Mikko Gronoff
227cbbf1d8 Bump QT_VERSION to 6.5.2
Change-Id: I39201544b5b82fd35cceb1f0619bb2efe9bc5dba
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-05-08 17:55:56 +03:00
Mikko Gronoff
c97feb4696 qtwebengine, qtwayland: refresh patches
Refresh patches to fix build after latest submodule update.

Change-Id: I7f4e5d05287af89332b104b5a74f7ea93d049baa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-05-05 09:19:12 +00:00
Qt Submodule Update Bot
e82b7d8f1d Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I366e80e11c3048d992f0cdb27a20b8b2f1e90cb8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-05 09:19:07 +00:00
Qt Submodule Update Bot
dc978854f6 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I6f37fac1fe2b09d24042f7b6029a8372fa9763d5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-01 11:23:58 +00:00
Qt Submodule Update Bot
688c43df44 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I0965621f1ad55846649d2920a08f263c9822faa2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-28 21:29:41 +00:00
Samuli Piippo
7bf38723c9 packagegroups: enable workaround for allarch packagegroup
Enable workaround for the sanity check of allarch packagegroups
which caused
ERROR: nativesdk-packagegroup-qt6-toolchain-host-essentials-1.0-r0
  do_package_write_rpm: An allarch packagegroup shouldn't depend on
  packages which are dynamically renamed (nativesdk-qttools-dev
  to nativesdk-libqt6uitools-dev)

Nativesdk changes the PACKAGE_ARCH correctly, but it cannot be
inherited first because that would throw another sanity warning.

Fixes: QTBUG-113178
Change-Id: Ifd77ef76f37b9fe39ef38adcc28c87130bf6d6d4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 5b387fd78d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-28 10:53:46 +00:00
Qt Submodule Update Bot
169b252fcd Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ib98e7fd82ad396f15bbaf332e2b24a103c4f48e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-26 23:57:22 +00:00
Qt Submodule Update Bot
20dfcfc5e6 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I1c73a17f1712c3c46f9b9803290d5ea87046244f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-21 16:59:35 +00:00
Samuli Piippo
671b41ca4b coin: test against mickledore
Add testing against Yocto 4.2 mickledore.

Change-Id: If69b95726e858849470ed433235916811501aed8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7931febe45)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-21 10:03:21 +00:00
Samuli Piippo
5362dfd3c9 qtwayland: enable all wayland drivers
Remove separate dmabuf PACKAGECONFIGs and let qtwayland
enable all client buffer integration plugins it can.

Task-number: QTBUG-112725
Change-Id: Ic841f3349fee36e5207d9b60e5733ac8ee79ee56
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8f50970006)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-19 11:10:45 +00:00
Samuli Piippo
01bae54aad srcrev_update: use renamed variable
oe-core renamed its internal variable, set both old and new variable
to work with old and new versions of oe-core.

Change-Id: I90293c6d37c3ca5d5d82d67e1269afa2b12f1d89
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 44990089fc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-19 11:10:45 +00:00
Qt Submodule Update Bot
65e670e290 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I4dc32693af9f47151cea4ce8c95773b40b76d21e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-18 15:44:03 +00:00
Martin Jansa
68c01dd9a3 packagegroup-qt6-commercial-modules: include qt6-commercial.inc
* all rdepends are skipped without Commercial Qt, make sure the
  packagegroup is skipped as well

* fixes:
  ERROR: Nothing RPROVIDES 'qmlcompilerplus' (but meta-qt6/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb RDEPENDS on or otherwise requires it)
  qmlcompilerplus was skipped: Available only with Commercial Qt
  NOTE: Runtime target 'qmlcompilerplus' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['qmlcompilerplus']
  ERROR: Nothing RPROVIDES 'qtvncserver' (but meta-qt6/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb RDEPENDS on or otherwise requires it)
  qtvncserver was skipped: Available only with Commercial Qt
  NOTE: Runtime target 'qtvncserver' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['qtvncserver']

Change-Id: I373c034989a643b5e95f84deb5130580201eddea
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit f26b62e29e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-17 18:19:15 +00:00
Qt Submodule Update Bot
7adb030da6 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I04a607c7271718d590117a2360851401d6854301
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-14 02:47:25 +00:00
Ari Parkkila
67e241179c Add python3-appdirs to native and nativesdk builds
Fixes: QTBUG-112774
Change-Id: Ic8eca3cc0d6de2262581ea2db804f510a0c6f8af
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 88ffeb7c99)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-13 14:22:32 +00:00
Samuli Piippo
514cf00d03 Make python-html5lib optional
Add python-html5lib to the SDK only if openembedded layer is available.

Change-Id: I381382c355e2834c2aadd5976e59007be0549ac9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e54ee19bfa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-27 17:46:42 +00:00
Samuli Piippo
dba8882597 qtserialbus: socketcan need openembedded layer
Don't enable socketcan PACKAGECONFIG unless openembedded layer
is available.

Change-Id: I54aa0d70014448bf5425ef7a49f9a32e27ba7807
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a4bf9c64e5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-27 17:46:36 +00:00
Andrej Valek
b2e56e7dc7 qt6-git: do not override CVE products
Some components use also base name in NVD CVE database product:
| sqlite> select * from products where product like 'qtbase';
| CVE-2019-18281|qt|qtbase|5.11.0|>=|5.11.3|<=
| CVE-2019-18281|qt|qtbase|5.12.0|>=|5.12.5|<
| sqlite> select * from products where product like 'qtsvg';
| CVE-2021-45930|qt|qtsvg|5.0.0|>=|5.15.2|<=
| CVE-2021-45930|qt|qtsvg|6.0.0|>=|6.2.1|<=

Change-Id: Ic8cbc59522731f49907e10bf08c6a00a213ae006
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit d4f4b54f4e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-22 14:37:34 +00:00
Samuli Piippo
43edb13d16 coin: be explicit about accepted commercial licenses
Dunfell is only branch that still uses the old whitelist variable.
Rename the include file and be specific what commercial recipes the
build needs. Remove the separate post-inclusive include file and move
the accepted commercial license variable to common include file.

Change-Id: Ic80b42d71037637298c805a60f20c8737f00b026
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit a55215df48)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-22 14:37:34 +00:00
Samuli Piippo
c366b27397 qtbase: update patches
Fuzz detected.

Change-Id: I13269e8d0cf239f32348e70dec3e2e7fb6e2cc84
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a6bdb1e987)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-21 09:24:47 +00:00
Qt Submodule Update Bot
d174e02a18 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I17ae80152db235df798478b2c61cba6ad5ed3d6c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-21 09:24:47 +00:00
Samuli Piippo
0e26198d2b qtgrpc: add dependency to declarative for examples
Additional examples depend on QtQuick.

Change-Id: I0373dc10d072f75c4f099131aa9b6d7876e17808
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e44a806e40)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-20 22:02:20 +00:00
Michal Klocek
a860bdf4bd Add python3-html5lib to sdk
This is required by qtwebenigne to be compiled with sdk.

Change-Id: I0053ca241c1b60b60edbc99f0830434a1d95f92d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit aec03e788c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-15 18:16:59 +00:00
Samuli Piippo
db80d4d2c7 Coin: fetch repo from github
Git clones from google fail frequently with:
   >> fatal: early EOF
   >> error: index-pack died
Switch to using github mirror for the git-repo repository.

Change-Id: Id0cbf3c59e50869d62880e56251b003490c4c1ee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 61f984c49d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-09 21:26:56 +00:00
Ari Parkkila
f4e522b699 Change GCC optimization for qtwebengine on armv7a-neon
Disable -O2 optimization to avoid SIGBUS alignment failure, see
GCC compiler bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97473

Fixes: QTBUG-109565
Change-Id: I4e6b2c27ad851666b1f25d472932b601442d2fe6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit ea4489ce49)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-07 14:02:35 +00:00
Qt Submodule Update Bot
8dc7f81130 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Idb1b51c38b8f5a7173b0eb0afb133aea31dabe31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-07 06:51:01 +00:00
Mikko Gronoff
6ff0db5c6f Bump QT_VERSION to 6.5.1
Change-Id: Ie8b3f9af542fbabeed8c29e54e8008d39bf5afc5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-03-03 09:43:18 +02:00
Qt Submodule Update Bot
637a3a6a4e Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I2ed2257ab85ffd1fbf002b13c2e88f1212b6d8ac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-02 19:15:18 +00:00
Qt Submodule Update Bot
0d816d3fcb Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ib7fa188dd9c612e547aa47e23743a818427c2e5f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-01 19:55:41 +00:00
Qt Submodule Update Bot
9b749150e3 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I8d11e76211de2aed8296bc191725d1e40b442d56
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-28 13:28:12 +00:00
Qt Submodule Update Bot
03a5bb2d00 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Idbf4f0060430724424d7dd3c3d25779b9c069077
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-27 13:44:33 +00:00
Samuli Piippo
d0876583b1 qtmultimedia: make default backend configurable
QtMultimedia provides gstreamer and ffmpeg backends where ffmepg is the
default backend. Add configuration that allows changing the default
backend and make gstreamer the default one.

Change-Id: I1d9f8916508ddf11c1ef2908543d77e12acdf0bc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 4862c58253)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-27 13:11:17 +00:00
Samuli Piippo
bd25d1ef34 qtmultimedia: add PACKAGECONFIGs for spatialaudio
Provides additional QML module for spatialaudio with QtQuick3D.

Change-Id: I4d10a430a6f162c94998ef4a9b20ef9e91897f18
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ff2d48090b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-27 13:11:08 +00:00
Qt Submodule Update Bot
41eeefb86a Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Id5d6c834e9bbabba6a409ccc4d565af4b7965774
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-20 12:36:44 +00:00
Samuli Piippo
60fc617037 qtbase: refresh patch
Fuzz detected.

Pick-to: dev
Change-Id: I09e53fe47a8e01384fce9bdf5960f3c4f1f51093
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-02-20 12:36:43 +00:00
Samuli Piippo
590d6893cd coin: always use the latest platforms for CI build
Change the CI dependencies so that we always get the VM configurations
from the qt5.git dev branch. This makes sure that all Yocto builds,
regardless of the Qt version, are using the same host VM version.

Change-Id: Iceb5ca006b8d83ed636d59566a115d64d3919e38
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a162d8c5a6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-14 15:32:57 +00:00
Samuli Piippo
a1fb7ce5fc Revert "qtbase: fix build with older CMake"
This reverts commit 3a33e963bd.
Commit is merged upstream.

Change-Id: Icc9f0aca9bc22f90f528775612c9c2e549e490d3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-09 13:02:11 +00:00
Samuli Piippo
f1b6dce411 qttools: update revision
Needed to fix example build.

Change-Id: If3bb146430c357876b9f26598b55a9359b5fa076
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-09 13:02:00 +00:00
Qt Submodule Update Bot
d443eea7fe Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ic912c0e77e01f10bb02e2782a7785114d883332e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-09 13:01:55 +00:00
Samuli Piippo
cf3686848e protobuf: remove upstreamed fix
The protobuf fix is now available in meta-openembedded.

Change-Id: I83e911b64cf35767af22b76c19ea27ce818e300a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8454efd1ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-31 17:37:23 +00:00
Samuli Piippo
543604244d qtbase: enable kms platform plugin by default
Most targets can already use the kms/gbm platform plugins, so enabled
them by default. Targets that don't provide them can override the
PACKAGECONFIG_GRAPHICS to define which graphic backend they support.

Change-Id: I85b310608772884134a63138781aad9fa1220110
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit b1db9ca0d5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-31 12:50:22 +00:00
Samuli Piippo
c4561ed2f0 Use global variable for Qt version
Add a global variable that can be used whenever meta-qt6 layer is
included in the build to identify the Qt version.

Change-Id: I3d40d151e0be9f9123d2bf7cbe34a44861e7b093
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit a6f9d2499b)
2023-01-30 12:28:21 +00:00
Samuli Piippo
a9d51b54a8 qtgrpc: include host tools in the toolchain
Add fix for protobuf so that we can build and include nativesdk-qtgrpc
in the toolchain. The protobuf fix has been merged in meta-openembedded
master, but not in langdale.

Change-Id: I37a90e1a79d64a8154ab6fb510a9d8d5cf6d26c5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 8c17fb058a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-27 17:44:23 +00:00
Samuli Piippo
b6928361f7 qttranslations: add catalogs.json into dev package
A new catalogs.json file is created for deployment purposes.
Include it a dev package.

Pick-to: dev
Change-Id: I2e28c9ee886d8f09a79c5f13cf38e47cb2dc81f0
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-25 08:08:42 +00:00
Samuli Piippo
3a33e963bd qtbase: fix build with older CMake
Include fix for older CMake 3.16 used in dunfell.

Change-Id: Ie9a735d1212d8ef2156f36178bda239094c1fbe7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-25 08:08:35 +00:00
Qt Submodule Update Bot
c4f00fb55e Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I750310b1c9ad4acfd7d518caf5cac539cfa150fd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-25 08:08:27 +00:00
Samuli Piippo
deda6132c1 qtbase: move xkbcommon and glib to defaults
Both xkbcommon (for keyboard handling) and glib (for eventloop)
are useful also without X11. Move them to default PACKAGECONFIGs.

Change-Id: Ib298a0916d781fd11c0e4ad53dc642734d60ca3b
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 9ad2cce88e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-20 18:45:43 +00:00
Samuli Piippo
b8dfd94b54 qtbase: fix scripts from libexec dir
Some of the scripts were moved to libexec dir, which must also
be patched.

Change-Id: I2099f61f8dbdf8d4eed010de146f18146585a40e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a11e036440)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-20 18:45:43 +00:00
Samuli Piippo
3a88a30eaa qtbase: use correct path to libdir
Qt might be using different path to libs.

Change-Id: Iaf0721af1c5e74cd293437cb35c287bd820fa3a5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 91a21476ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-20 18:45:42 +00:00
Samuli Piippo
12e4e29e4a qtmultimedia: enable ffmpeg backend
The ffmpeg backend is now the default backend for qtmultimedia.
Environment variable QT_MEDIA_BACKEND can used at runtime to
selected between the ffmpeg and gstreamer backends.

Change-Id: I751737fd7adaeeceb58e889765435750f3c3f274
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit cf715572cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-19 09:57:30 +00:00
Samuli Piippo
de89ed0547 qtwebengine: update chromium revision
Task-number: QTBUG-110272
Change-Id: Ic031c857483777deeacbd65f7beaf7c007fccb08
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-17 14:24:29 +00:00
Samuli Piippo
6b923c4803 Add recipe for QtInsightTracker
QtInsightTracker is a commercial-only module.

Task-number: ANALYTICS-237
Task-number: QTBUG-108568
Change-Id: I30412dec8552898b76865402c2e2ccfcae8d1904
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 56710e8724)
2023-01-17 08:31:11 +00:00
Mikko Gronoff
f4c32a89eb webengine: update chromium branch
Webengine updated to chromium 108 branch.

Change-Id: Ia67581eee6d0963b77bd4d60724d2845d03f94bd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-16 09:06:55 +02:00
Qt Submodule Update Bot
9ec574ff57 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ie6699706e7119356de41697937afef385a3e5cbd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-16 07:06:49 +00:00
Samuli Piippo
40a6e8b15f sdk: use security cflags in cmake toolchain file
Keep the SECURITY_CFLAGS set by Yocto builds also in the SKD's
CMake toolchain file. Instead remove only the fortify flags,
since they add unnecessary warnings when doing debug builds
with Qt Creator.

Change-Id: Ia01f92f21c4f68b1be0d57f9a586a34acbe2333c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a942032591)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-11 19:38:56 +00:00
Samuli Piippo
29fedc0490 Support SDK workflow inside a Yocto build
Add support for using qmake directly from Yocto build sysroots
with following workflow:

bitbake meta-ide-support
bitbake build-sysroots
. ./tmp/deploy/images/qemuarm64/environment-setup-cortexa57-poky-linux
qmake & make

Use configurable sysroot paths in populate_qt6_sdk_base so that it can
be reused also for yocto build sysroots.

Fixes: QTBUG-108778
Change-Id: Iee48f75edbc62e5adcca318a9f4cf17b7477f4a0
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 0533b8907e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-11 19:38:50 +00:00
Samuli Piippo
79ee80eef5 Add workaround for broken harfbuzz cmake config
Latest harfbuzz 6.0.0 has bad cmake config that uses absolute paths,
which breaks static builds for Qt. Add workaroud that causes Qt
to use pkg-config to find correct paths for libs and includes.

From qtshadertools build:
ninja: error: '/usr/lib/libharfbuzz.so.0.60000.0', needed by
'lib/libQt6ShaderTools.a', missing and no known rule to make it

Change-Id: I9f8bca0d4b9648e58c008e4064ff4f7b88f5f4f0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 23feda4f5b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-11 19:38:44 +00:00
Samuli Piippo
6d70fc56a5 sdk: move sdk mkspec additions to qtbase recipe
The qmake mkspec additions are used with the sdk when the toolchain
environment-setup script hasn't been run. Instead of adding those in
the sdk creation phase, do it already in the qtbase recipe.

Change the mkspec also so that CC/CXX has only the compiler executable,
but none of the compile flags that usually are there in Yocto builds.
This keeps Qt Creator happier as well.

Task-number: QTCREATORBUG-27372
Change-Id: If27d595965df59ff9846f4c773469889a8480040
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit cfaf86d808)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-11 19:38:43 +00:00
Qt Submodule Update Bot
bc621d2964 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I7909097f2bbf7aa4ba006b5661f8f9fada7b4680
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-06 04:01:36 +00:00
Samuli Piippo
a4a21021fb layer: add mickledore to LAYERSERIES_COMPAT
Change-Id: I28ebe75e2ae9d824b7bbf671539dafeadb9089d0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ad7dc64e16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-05 10:02:15 +00:00
Samuli Piippo
d400b71e3d readme: add 6.5 branch details
Change-Id: I580b98bac50e57aad08af540ede6646f6801bc4e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 6826a6aa09)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-03 14:30:36 +00:00
Qt Submodule Update Bot
9d4dab5294 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I7b2db5fe25855c3dca9431ee8af0e66daa431f6b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-03 03:43:28 +00:00
Qt Submodule Update Bot
92a537fc51 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ib978404bbcfb4f5a3d1b85c0ee2c1e747a514048
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-30 16:27:01 +00:00
Qt Submodule Update Bot
1e262bf900 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I6246927d6c4cdff5c6fabeaeda70947ad481dd62
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-29 12:24:00 +00:00
Qt Submodule Update Bot
ebfe7fffb2 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Idafd04598b34ccccbf741fb7aef493b14dde6174
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-28 13:14:31 +00:00
Qt Submodule Update Bot
5fe8e566dd Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ide3b8357e48238c52ec4d5a852351e31cd88c02c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-26 23:59:13 +00:00
Qt Submodule Update Bot
63d327e84d Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I1fd881c493fc9245e5e9058219365934d9d4c265
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-24 03:39:50 +00:00
Qt Submodule Update Bot
1816f7f9f0 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I2ff672b21ce43559755fc480f61e9364ba562f4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-17 03:22:37 +00:00
Qt Submodule Update Bot
ff3c7e1195 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I87091e0e626dbb3f9ecf3412afd2869981507951
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-15 08:08:27 +00:00
Qt Submodule Update Bot
281fe8ccb9 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I87eb53b1277eca2c28b252e14f9acd7221d97cbd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-15 04:42:24 +00:00
Samuli Piippo
d94706f529 Coin: don't use zip format for mingw sdk
Zip doesn't handle symlinks correctly and sdk won't work.

Change-Id: Id57cef766f708d714919994ea947701fcc83089a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 918cb5b310)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-14 16:53:37 +00:00
Mikko Gronoff
1f338b8c18 qt6-git.inc: switch to 6.5 branch
Change-Id: I6eecde2ae04be1a006c398fa0a54dc01afbf20b7
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-12-13 19:17:13 +02:00
Qt Submodule Update Bot
5c6525e5e0 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I65a6194857dd6f028901011cb5b4236239868f38
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-13 17:17:12 +00:00
83 changed files with 413 additions and 271 deletions

View File

@ -5,25 +5,27 @@ This layer depends on:
URI: https://git.openembedded.org/openembedded-core/
and optionally:
URI: https://git.openembedded.org/meta-openembedded/
Yocto version support
---------------------
The branching of meta-qt6 layer follows Qt branching scheme, that is
`dev` for the development branch, `6.x` for each minor release and
`lts-6.x` for commercial LTS releases.
The branching of meta-qt6 layer follows [Qt branching scheme](https://wiki.qt.io/Branch_Guidelines),
that is `dev` for the development branch, `6.x` for minor stabilization branches,
`6.x.y` for the release branches and `lts-6.x.y` for commercial LTS releases.
Each Qt release is tagged either as `v6.x.y` or `v6.x.y-lts`
Following table shows the Yocto branches which are used to test each
Qt version (x) and any additional Yocto releases that are stated in
the LAYERSERIES_COMPAT (c).
| Yocto \ Qt | dev | 6.4 | 6.3 | 6.2 |
| Yocto \ Qt | 6.5 | 6.4 | 6.3 | 6.2 |
| ---------- |:---:|:---:|:---:|:---:|
| master | x | x | | |
| langdale | x | x | | |
| scarthgap | x | | | |
| nanbield | x | | | |
| mickledore | c | x | | |
| langdale | c | x | | |
| kirkstone | x | x | x | x |
| honister | c | c | x | x |
| hardknott | c | c | c | c |
@ -55,15 +57,30 @@ QtWebEngine
QtWebEngine needs at least CMake 3.19, which is available starting from Hardknott.
For this reason QtWebEngine is not tested on older releases.
QtMultimedia
------------
Qt Multimedia now prefers [FFmpeg][1] as the multimedia backend instead of GStreamer.
FFmpeg recipe, however, is flagged with LICENSE_FLAGS = "commercial", which means
that user must accept the license before FFmpeg can be used in the build. If user
accepts the license using LICENSE_FLAGS_ACCEPTED = 'commercial_ffmpeg', the FFmpeg
support is enabled in Qt Multimedia. If user doesn't accept the license,
Qt Multimedia only uses GStreamer.
[1]: https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend
Contributing
------------
To contribute to this layer you should submit the patches for review using
To contribute to this layer submit the patches for review using
[Qt Gerrit](https://codereview.qt-project.org).
More information about Qt Gerrit and how to use it:
- https://wiki.qt.io/Gerrit_Introduction
- https://wiki.qt.io/Setting_up_Gerrit
- [Gerrit_Introduction](https://wiki.qt.io/Gerrit_Introduction)
- [Setting_up_Gerrit](https://wiki.qt.io/Setting_up_Gerrit)
Report bugs on [Qt Bug Tracker](https://bugreports.qt.io) using
`Yocto: meta-qt6 layer` component.
Layer maintainers
-----------------

View File

@ -10,6 +10,9 @@ PATH_DELIM:sdkmingw32 = ";"
QT6_INSTALL_HOST_LIBEXECDIR = "${QT6_INSTALL_LIBEXECDIR}"
QT6_INSTALL_HOST_LIBEXECDIR:sdkmingw32 = "${QT6_INSTALL_LIBEXECDIR:mingw32}"
TARGET_SYSROOT ?= "${SDKTARGETSYSROOT}"
NATIVE_SYSROOT ?= "${SDKPATHNATIVE}"
create_qt6_sdk_files () {
# Generate a qt.conf file to be deployed with the SDK
qtconf=${WORKDIR}/qt.conf
@ -28,23 +31,23 @@ create_qt6_sdk_files () {
echo 'Settings = ${QT6_INSTALL_SYSCONFDIR}' >> $qtconf
echo 'Examples = ${QT6_INSTALL_EXAMPLESDIR}' >> $qtconf
echo 'Tests = ${QT6_INSTALL_TESTSDIR}' >> $qtconf
echo 'HostPrefix = ${@os.path.relpath(d.expand("${SDKPATHNATIVE}"), d.expand("${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}"))}' >> $qtconf
echo 'HostData = ${@os.path.relpath(d.expand("${SDKTARGETSYSROOT}${QT6_INSTALL_ARCHDATADIR}"), d.expand("${SDKPATHNATIVE}"))}' >> $qtconf
echo 'HostBinaries = ${@os.path.relpath(d.expand("${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}"), d.expand("${SDKPATHNATIVE}"))}' >> $qtconf
echo 'HostLibraries = ${@os.path.relpath(d.expand("${SDKPATHNATIVE}${QT6_INSTALL_LIBDIR}"), d.expand("${SDKPATHNATIVE}"))}' >> $qtconf
echo 'HostLibraryExecutables = ${@os.path.relpath(d.expand("${SDKPATHNATIVE}${QT6_INSTALL_HOST_LIBEXECDIR}"), d.expand("${SDKPATHNATIVE}"))}' >> $qtconf
echo 'Sysroot = ${@os.path.relpath(d.expand("${SDKTARGETSYSROOT}"), d.expand("${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}"))}' >> $qtconf
echo 'HostPrefix = ${@os.path.relpath("${NATIVE_SYSROOT}", "${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}")}' >> $qtconf
echo 'HostData = ${@os.path.relpath("${TARGET_SYSROOT}${QT6_INSTALL_ARCHDATADIR}", "${NATIVE_SYSROOT}")}' >> $qtconf
echo 'HostBinaries = ${@os.path.relpath("${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}", "${NATIVE_SYSROOT}")}' >> $qtconf
echo 'HostLibraries = ${@os.path.relpath("${NATIVE_SYSROOT}${QT6_INSTALL_LIBDIR}", "${NATIVE_SYSROOT}")}' >> $qtconf
echo 'HostLibraryExecutables = ${@os.path.relpath("${NATIVE_SYSROOT}${QT6_INSTALL_HOST_LIBEXECDIR}", "${NATIVE_SYSROOT}")}' >> $qtconf
echo 'Sysroot = ${@os.path.relpath("${TARGET_SYSROOT}", "${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}")}' >> $qtconf
echo 'HostSpec = linux-oe-g++' >> $qtconf
echo 'TargetSpec = linux-oe-g++' >> $qtconf
echo 'SysrootifyPrefix = true' >> $qtconf
# add qt.conf to both bin and libexec dirs
cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/
cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_HOST_LIBEXECDIR}/
cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/target_qt.conf
cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}/
cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${NATIVE_SYSROOT}${QT6_INSTALL_HOST_LIBEXECDIR}/
cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}/target_qt.conf
install -d ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d
script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/qt6.sh
install -d ${SDK_OUTPUT}${NATIVE_SYSROOT}/environment-setup.d
script=${SDK_OUTPUT}${NATIVE_SYSROOT}/environment-setup.d/qt6.sh
touch $script
echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
@ -57,36 +60,21 @@ create_qt6_sdk_files () {
echo 'export OE_QMAKE_OBJCOPY="$OBJCOPY"' >> $script
echo 'export OE_QMAKE_AR_LTCG="${HOST_PREFIX}gcc-ar"' >> $script
mkspec=${SDK_OUTPUT}${SDKTARGETSYSROOT}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf
echo "count(QMAKE_AR, 1): QMAKE_AR = ${AR} cqs" >> $mkspec
echo "count(QMAKE_AR_LTCG, 1): QMAKE_AR_LTCG = ${HOST_PREFIX}gcc-ar cqs" >> $mkspec
echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${STRIP}" >> $mkspec
echo "isEmpty(QMAKE_OBJCOPY): QMAKE_OBJCOPY = ${OBJCOPY}" >> $mkspec
echo "isEmpty(QMAKE_CC): QMAKE_CC = ${CC}" >> $mkspec
echo "isEmpty(QMAKE_CFLAGS): QMAKE_CFLAGS = ${CFLAGS}" >> $mkspec
echo "isEmpty(QMAKE_CXX): QMAKE_CXX = ${CXX}" >> $mkspec
echo "isEmpty(QMAKE_CXXFLAGS): QMAKE_CXXFLAGS = ${CXXFLAGS}" >> $mkspec
echo "isEmpty(QMAKE_LINK): QMAKE_LINK = ${CXX}" >> $mkspec
echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${LDFLAGS}" >> $mkspec
sed -i $mkspec \
-e 's:${RECIPE_SYSROOT}:$$[QT_SYSROOT]:' \
-e 's:${TARGET_PREFIX}:$$[QT_HOST_PREFIX]${bindir}/${TARGET_SYS}/${TARGET_PREFIX}:'
# Generate a toolchain file for using Qt without running setup-environment script
cat > ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake <<EOF
cat > ${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/cmake/Qt6Toolchain.cmake <<EOF
cmake_minimum_required(VERSION 3.11)
include_guard(GLOBAL)
get_filename_component(SYSROOTS \${CMAKE_CURRENT_LIST_DIR}/../../../.. ABSOLUTE)
set(ENV{PATH} "${SDKPATHNATIVE}${bindir}${PATH_DELIM}\$ENV{PATH}")
set(ENV{PKG_CONFIG_SYSROOT_DIR} "${SDKTARGETSYSROOT}")
set(ENV{PKG_CONFIG_PATH} "${SDKTARGETSYSROOT}${libdir}/pkgconfig")
set(ENV{PATH} "${NATIVE_SYSROOT}${bindir}${PATH_DELIM}\$ENV{PATH}")
set(ENV{PKG_CONFIG_SYSROOT_DIR} "${TARGET_SYSROOT}")
set(ENV{PKG_CONFIG_PATH} "${TARGET_SYSROOT}${libdir}/pkgconfig")
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSROOT ${SDKTARGETSYSROOT})
set(CMAKE_SYSROOT ${TARGET_SYSROOT})
set(CMAKE_FIND_ROOT_PATH ${SDKTARGETSYSROOT})
set(CMAKE_FIND_ROOT_PATH ${TARGET_SYSROOT})
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@ -94,10 +82,10 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
set(CMAKE_SYSTEM_PROCESSOR ${TUNE_PKGARCH})
set(CMAKE_C_COMPILER "${SDKPATHNATIVE}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}gcc${EXE_EXT}")
set(CMAKE_CXX_COMPILER "${SDKPATHNATIVE}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}g++${EXE_EXT}")
set(CMAKE_C_COMPILER "${NATIVE_SYSROOT}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}gcc${EXE_EXT}")
set(CMAKE_CXX_COMPILER "${NATIVE_SYSROOT}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}g++${EXE_EXT}")
set(TARGET_COMPILER_FLAGS "${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}")
set(TARGET_COMPILER_FLAGS "${TARGET_CC_ARCH} --sysroot=${TARGET_SYSROOT}")
set(TARGET_LINKER_FLAGS "${TARGET_LDFLAGS}")
include(CMakeInitializeConfigs)
@ -140,17 +128,17 @@ EOF
# resolve absolute paths at runtime
sed -i -e 's|${SDKPATH}/sysroots|\${SYSROOTS}|g' \
${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake
${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/cmake/Qt6Toolchain.cmake
# Conan profile
mkdir -p ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/conan
cat > ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/conan/profile <<EOF
include(${SDKTARGETSYSROOT}${datadir}/conan/profile)
mkdir -p ${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/conan
cat > ${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/conan/profile <<EOF
include(${TARGET_SYSROOT}${datadir}/conan/profile)
[env]
QT_CONFIGURE_MODULE=${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/qt-configure-module
QT_CONFIGURE_MODULE=${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}/qt-configure-module
EOF
}
# default debug prefix map isn't valid in the SDK
DEBUG_PREFIX_MAP = ""
SECURITY_CFLAGS = ""
lcl_maybe_fortify = ""

View File

@ -12,6 +12,7 @@ QT_FORCE_BUILD_TOOLS ?= "OFF"
EXTRA_OECMAKE:append:class-target = "\
-DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \
-DQT_FORCE_BUILD_TOOLS=${QT_FORCE_BUILD_TOOLS} \
-D__harfbuzz_broken_config_file=TRUE \
"
EXTRA_OECMAKE:append:class-nativesdk = "\
-DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \

View File

@ -17,6 +17,7 @@ python do_srcrev_update() {
return
d.setVar("__BBSEENSRCREV", "1")
d.setVar("__BBSRCREV_SEEN", "1")
for scm in scms:
ud = urldata[scm]
for name in ud.names:

View File

@ -1,2 +1,5 @@
product_dependency:
../../qt/qt5:
ref: "dev"
dependencies:
{}

View File

@ -17,7 +17,7 @@ machine_type:
#
# [target1] [target2] [target3] [target4] [target5]
# [machine] qemuarm64 qemux86 qemuarm qemux86-64 qemuarm64
# [yocto] kirkstone langdale master dunfell master
# [yocto] nanbield scarthgap scarthgap dunfell kirkstone
# [X11] no no yes yes no
# [mingw] no yes no no no
# [static] no no no no yes
@ -31,10 +31,10 @@ target1: &target1
variableValue: qemuarm64
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: kirkstone.xml
variableValue: nanbield.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs post-inclusive wayland
variableValue: ci configs wayland
enable_if:
condition: property
property: target.arch
@ -47,10 +47,10 @@ target2: &target2
variableValue: qemux86
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: langdale.xml
variableValue: scarthgap.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs post-inclusive wayland mingw no-webengine
variableValue: ci configs wayland mingw no-webengine
enable_if:
condition: property
property: target.arch
@ -63,10 +63,10 @@ target3: &target3
variableValue: qemuarm
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: master.xml
variableValue: scarthgap.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs post-inclusive
variableValue: ci configs
enable_if:
condition: property
property: target.arch
@ -82,7 +82,7 @@ target4: &target4
variableValue: dunfell.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs pre-inclusive no-webengine
variableValue: ci configs dunfell no-webengine
enable_if:
condition: property
property: target.arch
@ -95,10 +95,10 @@ target5: &target5
variableValue: qemuarm64
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: master.xml
variableValue: kirkstone.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs post-inclusive wayland static no-webengine
variableValue: ci configs wayland static no-webengine
enable_if:
condition: property
property: target.arch
@ -137,10 +137,11 @@ instructions:
chmod +x repo
./repo init \
--repo-url https://github.com/theqtcompany/git-repo \
-u git://code.qt.io/yocto/boot2qt-manifest \
-b ci \
-m ${MANIFEST} \
--reference /mnt/mirror
--reference /mnt/yocto-cache/mirror
./repo sync
source ./poky/oe-init-build-env

View File

@ -1,11 +1,5 @@
PREFERRED_PROVIDER_udev = "systemd"
# use gold
DISTRO_FEATURES:append = " ld-is-gold"
# use systemd
DISTRO_FEATURES:append = " systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
VIRTUAL-RUNTIME_initscripts = ""
INIT_MANAGER:forcevariable = "systemd"
INHERIT += "buildstats buildstats-summary"
INHERIT += "rm_work"
@ -13,14 +7,14 @@ INHERIT += "rm_work"
# default to commercial Qt
QT_EDITION = "commercial"
LICENSE_FLAGS_ACCEPTED = "commercial_ffmpeg"
# include commercial addons and enable Qt QML Compiler
QT_COMMERCIAL_MODULES = "1"
# fast compression of SDK tar package
SDK_XZ_COMPRESSION_LEVEL = "-1"
SDK_ARCHIVE_TYPE:sdkmingw32 = "zip"
# be more strict with QA warnings, turn them all to errors:
EXTRA_QA = "\
ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi \
@ -33,6 +27,10 @@ EXTRA_QA = "\
ERROR_QA:append = "${EXTRA_QA}"
WARN_QA:remove = "${EXTRA_QA}"
# workaround for qemu
# nativesdk-qemu-user-mips rdepends on nativesdk-bash, but it isn't a build dependency
INSANE_SKIP:nativesdk-qemu-user-mips = "build-deps"
# enable thumb for broader test coverage (oe-core autobuilder doesn't have thumb enabled)
PREFERRED_ARM_INSTRUCTION_SET ?= "thumb"
ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
@ -45,6 +43,7 @@ PACKAGECONFIG:append:pn-qtbase = "\
tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
use-gold-linker \
"
# imageformats mng FIXME
@ -65,6 +64,7 @@ PACKAGECONFIG:append:pn-qtdeviceutilities = " examples"
PACKAGECONFIG:append:pn-qtgrpc = " examples"
PACKAGECONFIG:append:pn-qthttpserver = " examples"
PACKAGECONFIG:append:pn-qtimageformats = " examples"
PACKAGECONFIG:append:pn-qtinsighttracker = " examples"
PACKAGECONFIG:append:pn-qtinterfaceframework = " examples"
PACKAGECONFIG:append:pn-qtlanguageserver = " examples"
PACKAGECONFIG:append:pn-qtlocation = " examples"

1
coin/test-dunfell.inc Normal file
View File

@ -0,0 +1 @@
LICENSE_FLAGS_WHITELIST = "commercial_ffmpeg commercial_x264"

View File

@ -1 +0,0 @@
LICENSE_FLAGS_ACCEPTED = "commercial"

View File

@ -1 +0,0 @@
LICENSE_FLAGS_WHITELIST = "commercial"

View File

@ -14,6 +14,13 @@ BBPATH .= ":${LAYERDIR}"
# We have a recipes directory, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
# bbappends for optional layers
BBFILES_DYNAMIC += " \
meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \
meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \
openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \
"
BBFILE_COLLECTIONS += "qt6-layer"
BBFILE_PATTERN_qt6-layer := "^${LAYERDIR}/"
@ -27,9 +34,9 @@ BBFILE_PRIORITY_qt6-layer = "${BBFILE_PRIORITY_core}"
# cause compatibility issues with other layers
LAYERVERSION_qt6-layer = "1"
LAYERDEPENDS_qt6-layer = "core"
LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"
LAYERSERIES_COMPAT_qt6-layer = "dunfell gatesgarth hardknott honister kirkstone langdale"
LAYERSERIES_COMPAT_qt6-layer = "dunfell gatesgarth hardknott honister kirkstone langdale mickledore nanbield scarthgap"
LICENSE_PATH += "${LAYERDIR}/licenses"
@ -39,6 +46,7 @@ QT_GIT_PROJECT ?= "qt"
QT_GIT ?= "git://code.qt.io"
QT_GIT_PROTOCOL ?= "git"
QT_EDITION ?= "opensource"
QT_VERSION = "6.5.7"
QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
@ -46,7 +54,4 @@ QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
QT_COMMERCIAL_MODULES ?= "0"
# License mapping back to old license files
SPDXLICENSEMAP[GPL-3.0-only] = "GPL-3.0"
SPDXLICENSEMAP[LGPL-3.0-only] = "LGPL-3.0"
SPDXLICENSEMAP[GPL-2.0-or-later] = "GPL-2.0"
SPDXLICENSEMAP[GFDL-1.3-no-invariants-only] = "GFDL-1.3"

View File

@ -16,6 +16,6 @@ RDEPENDS:${PN} += "${DEPS}"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5"
SRC_URI[sha256sum] = "42b0a0d37ed77cf1a9994f5ed77e3a6138468241df1700667a9ab0b848d6ad57"
SRC_URI[sha256sum] = "b55c239f3ae7e23c5c8434f38901c5bcacb6afd17e88e37934b46e44558df295"
BBCLASSEXTEND = "nativesdk native"

View File

@ -0,0 +1 @@
BBCLASSEXTEND = "native nativesdk"

View File

@ -0,0 +1,10 @@
inherit populate_sdk_qt6_base
TARGET_SYSROOT = "${STANDALONE_SYSROOT}"
NATIVE_SYSROOT = "${STANDALONE_SYSROOT_NATIVE}"
SDK_OUTPUT = ""
do_qt6_support () {
create_qt6_sdk_files
}
addtask do_qt6_support after do_build_native_sysroot before do_build

View File

@ -0,0 +1 @@
BBCLASSEXTEND = "native nativesdk"

View File

@ -11,6 +11,8 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS:${PN} += " \
nativesdk-qtapplicationmanager-dev \
nativesdk-qtapplicationmanager-tools \
nativesdk-qtgrpc-dev \
nativesdk-qtgrpc-tools \
nativesdk-qtquick3d-dev \
nativesdk-qtquick3d-tools \
nativesdk-qtremoteobjects-dev \
@ -26,6 +28,6 @@ RDEPENDS:${PN} += " \
FORLINUXHOST:mingw32 = ""
FORLINUXHOST = " \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools', '', d)} \
nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools \
"

View File

@ -1,6 +1,9 @@
DESCRIPTION = "Qt6 development host commercial packages"
LICENSE = "MIT"
# disable sanity check for allarch packagegroup
PACKAGE_ARCH = ""
inherit packagegroup nativesdk
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"

View File

@ -2,7 +2,7 @@ DESCRIPTION = "Qt6 development host essential packages"
LICENSE = "MIT"
# disable sanity check for allarch packagegroup
#PACKAGE_ARCH = ""
PACKAGE_ARCH = ""
inherit packagegroup nativesdk

View File

@ -1,6 +1,9 @@
DESCRIPTION = "Qt6 development host packages"
LICENSE = "MIT"
# avoid warning with inherit_defer allarch
PACKAGE_ARCH = ""
inherit packagegroup nativesdk
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
@ -18,4 +21,5 @@ FORLINUXHOST = " \
nativesdk-cmake \
nativesdk-ninja \
nativesdk-perl-modules \
nativesdk-python3-html5lib \
"

View File

@ -16,10 +16,10 @@ RDEPENDS:${PN} += " \
qtconnectivity \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
qtdeviceutilities \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'qtgrpc', '', d)} \
qtgrpc \
qthttpserver \
qtimageformats \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'qtinterfaceframework', '', d)} \
qtinterfaceframework \
qtlocation \
qtlottie \
qtmqtt \
@ -46,13 +46,22 @@ RDEPENDS:${PN} += " \
qtwebsockets \
"
ARCHITECTURE_LIMITED_MODULES = "\
RDEPENDS:${PN}:append:aarch64 = "\
qtquick3dphysics \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebview', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
"
RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
RDEPENDS:${PN}:append:armv6 = "\
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
"
RDEPENDS:${PN}:append:armv7a = "\
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
"
RDEPENDS:${PN}:append:armv7ve = "\
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
"
RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
RDEPENDS:${PN}:append:x86-64 = "\
qtquick3dphysics \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
"
RDEPENDS:${PN}:append:aarch64 ="${ARCHITECTURE_LIMITED_MODULES}"
RDEPENDS:${PN}:append:arm ="${ARCHITECTURE_LIMITED_MODULES}"
RDEPENDS:${PN}:append:x86 ="${ARCHITECTURE_LIMITED_MODULES}"
RDEPENDS:${PN}:append:x86-64 ="${ARCHITECTURE_LIMITED_MODULES}"

View File

@ -4,10 +4,12 @@ LICENSE = "MIT"
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
include recipes-qt/qt6/qt6-commercial.inc
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS:${PN} += " \
qmlcompilerplus \
qtinsighttracker \
qtvncserver \
"

View File

@ -1,5 +1,16 @@
#!/bin/sh
if [ ! -e tst_list ]; then
echo PASS: no tests
exit 0
fi
export LANG=C.UTF-8
export QT_QPA_PLATFORM=offscreen
for test in $(cat tst_list); do
( cd $(dirname ${test}) && ./$(basename ${test}) )
(
cd $(dirname ${test})
t=$(basename ${test})
./${t} && echo PASS: ${t} || echo FAIL: ${t}
)
done

View File

@ -1,6 +1,12 @@
LICENSE = "The-Qt-Company-Commercial"
LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
LIC_FILES_CHKSUM = " \
file://src/qmlcompilerplus/cppcodegen_p.h;endline=27;md5=6a1dccd03d0d5864357e72b67def8ff2 \
file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
"
inherit qt6-cmake
@ -11,6 +17,4 @@ include recipes-qt/qt6/qt6-commercial.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qmlcompilerplus-native"
PTEST_ENABLED = "0"
BBCLASSEXTEND = "native nativesdk"

View File

@ -19,6 +19,7 @@ inherit features_check
REQUIRED_DISTRO_FEATURES = "opengl"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
ASSIMP_BRANCH = "qt6_assimp"

View File

@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
ENABLE_QMLCOMPILER = "0"

View File

@ -6,3 +6,4 @@ python() {
QT_GIT = "${QT_COMMERCIAL_GIT}"
QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
QT_MODULE = "tqtc-${BPN}"
QT_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}"

View File

@ -2,66 +2,67 @@ DESCRIPTION ?= "Qt is a cross-platform application development framework for des
HOMEPAGE ?= "https://www.qt.io"
QT_MODULE ?= "${BPN}"
QT_MODULE_BRANCH ?= "dev"
QT_MODULE_BRANCH ?= "6.5"
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
QT_MODULE_REPO ?= "${QT_MODULE}.git"
SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
CVE_PRODUCT = "qt"
CVE_PRODUCT:append = " qt"
S = "${WORKDIR}/git"
PV = "6.5.0"
PV = "${QT_VERSION}"
SRCREV = "${SRCREV_${QT_MODULE}}"
SRCREV_tqtc-qmlcompilerplus = "5d16cd3c8cbcf5b6e24154a6d5afb47817d46dde"
SRCREV_tqtc-qtvncserver = "55deb182a027c958543ff0033b5c2a4b65c5d1e1"
SRCREV_qt3d = "00cf929edb378616d0952a104bcdd006a9dc9ba9"
SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
SRCREV_qt5compat = "d9b5f0a01f4f31ee3e391676a391a4b26d8e3387"
SRCREV_qtbase = "fa2153bd10057d7adbc5f5ededa1fd97c4a68161"
SRCREV_qtapplicationmanager = "5b0ed46e8b3c17c092622e0a404b5d1e21a274d1"
SRCREV_qtcharts = "e7b78673243a24f27dfc56d20d8b445f043e3a8c"
SRCREV_qtcoap = "1ac403c5a14b419866045871f28cd575ff266c3e"
SRCREV_qtconnectivity = "51ea4b35494c0ea7c64744c2dfbb6f3ccc55142c"
SRCREV_qtdatavis3d = "587440bb7767d13fcfccb54672736bad133128cf"
SRCREV_qtdeclarative = "a39dc2807c22c6819647bab1259ba8f7532e7f32"
SRCREV_qtdeviceutilities = "29e0d958a5d8ffe92d2d5967297bf5f500a5f76c"
SRCREV_qtgrpc = "e02a320d98e71952c51adc850b3cd54c63d0b5d4"
SRCREV_qthttpserver = "2d5d24516232e4e4669cbb57a98ffd05bda15c57"
SRCREV_qtimageformats = "e16219129c7de87943b4b17a4727e66bdcf9a931"
SRCREV_qtinterfaceframework = "4be4979c6c7503e4410907f26183dd68057b07c6"
SRCREV_qtlanguageserver = "2866e00b623bd922a80f3375d1cddc03106a4006"
SRCREV_qtlocation = "575e271a99caac3f1316d5192c56c0fe58380b42"
SRCREV_qtlottie = "593fe98e180f5806da818d4a6a07224937ca855b"
SRCREV_qtmqtt = "2aec98e589d4055ad29c6d57ca5bf0b27eb58020"
SRCREV_qtmultimedia = "2323a0eb848014ad07f435ae6dd8e084963bf3aa"
SRCREV_qtnetworkauth = "b10394d4b0053939eafe60abf8785ef63b0547b3"
SRCREV_qtopcua = "025344ed1a511210f5f61efc4f66c731ec00b8ae"
SRCREV_qtpositioning = "fb5deb7ca0ef88865674cdbfa096d8d510ca5717"
SRCREV_qtquick3d = "8fbf55eefd6ff7720e0f978bc65e517a5c8323ca"
SRCREV_tqtc-qmlcompilerplus = "676f8e0aaa6c7ca69e03945cc5e632cd8f33214d"
SRCREV_tqtc-qtinsighttracker = "1455419d99b9ba8bdb651aeee78194103ef05344"
SRCREV_tqtc-qtvncserver = "26911dc362f576ca1fd345da7d541085f6524b99"
SRCREV_qt3d = "4c1756d009c2769df29c4f376650e1c6c2a1e4d3"
SRCREV_qt3d-assimp = "5967dee48b0b8ed32a41579559570e380462a1dd"
SRCREV_qt5compat = "523fa9ce6524d5ca65c88b66aaab86c010ef52ae"
SRCREV_qtbase = "595f2126f0d6575e343297b39a6daea1d29a9508"
SRCREV_qtapplicationmanager = "eb9b0d3812567908e817ff0a767edc1c9939f888"
SRCREV_qtcharts = "701c235e1e5923138643610ab8fe1c4e79d2952e"
SRCREV_qtcoap = "8ce1e1cfd8a05559bb17b611e74610b5daefbaf0"
SRCREV_qtconnectivity = "dfdfdac8b5eb4d2b00b61ee61b0555f4369d383e"
SRCREV_qtdatavis3d = "058095073b55b1b1e18976d31f8f136c167d96d0"
SRCREV_qtdeclarative = "4332989bef24c1039c9097db52196f05979f2b72"
SRCREV_qtdeviceutilities = "d0af9bf8fc2b6613c26f225b3737eda1b3f563f1"
SRCREV_qtgrpc = "9c898cf37faaaab2ad8e848965389e528eb82dd6"
SRCREV_qthttpserver = "0ec3e49cbf648508cbb3e4f8bce0738a883ec5ee"
SRCREV_qtimageformats = "1fa7d8c65f1002e6074f5a74412f326a44b7b7df"
SRCREV_qtinterfaceframework = "d058071af71c8417dd952fbb1c4bd7b6287dafd0"
SRCREV_qtlanguageserver = "3c66388440180447a36c1a73b144a7731ec6475f"
SRCREV_qtlocation = "0e4a1d326361fc1b26455b078b0d82ff13f670a8"
SRCREV_qtlottie = "19ea2d75c45ff25dd796a82bebf0dffa9dd0965c"
SRCREV_qtmqtt = "80845bc06e05964f781bff770256baccbf20f3d2"
SRCREV_qtmultimedia = "5c245118182649ecbd1571a81f6d73a2c513246a"
SRCREV_qtnetworkauth = "43b96a2a65e58abeeb5d7c6c45cafe0f979152b7"
SRCREV_qtopcua = "5ac9868cc78035dc40c9e10fb8856caab3c3ee38"
SRCREV_qtpositioning = "228243b0f03257e2664bb741d6d05ba1dd592a2c"
SRCREV_qtquick3d = "6a96e2c9788093acedf21cd023c2db29197e50fc"
SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0"
SRCREV_qtquick3dphysics = "a224a2efbad8341e34862972a7f0b9696a4f5339"
SRCREV_qtquickdesigner-components = "eef765c5ed34eac8c1294fbeda55d273f916ca86"
SRCREV_qtquicktimeline = "e0b520f8d1d10e83a4f6cdd665a2455304d6d43b"
SRCREV_qtremoteobjects = "0d46612844917097d63df2dc1479797d979d8ffe"
SRCREV_qtscxml = "0169f138947a786eed509fa8b293b53171f5b1e4"
SRCREV_qtsensors = "271242843834add627e1a1b1e662024c3365af37"
SRCREV_qtserialbus = "4e192431aee8255acf13a4a8d628a8a76abd957d"
SRCREV_qtserialport = "e3bb82c12f4cebf70242a17791fc570f5088f37d"
SRCREV_qtshadertools = "0826a1688f9513115633cace5afb07e459eb265d"
SRCREV_qtspeech = "1344d37d041ec563ba6bd3e379a418745c0b9ad4"
SRCREV_qtsvg = "1f9407158e56c2d1e058b3aa1627de8662d1f8fb"
SRCREV_qttools = "f443f635e942fab8770a8eff6884bc60accb7e1d"
SRCREV_qttools-qlitehtml = "bd70f93ce41443a6a90a269531393f575685283e"
SRCREV_qttools-qlitehtml-litehtml = "e3f37e3d5a6931ddecf81a9d746fc3e9a3475998"
SRCREV_qttranslations = "6b5cc3cd37075110ebd1b7d9a39cc9ccf2e40499"
SRCREV_qtvirtualkeyboard = "f592419efbf09364ed0295f239424bf56fe8b733"
SRCREV_qtwayland = "c76f9bcd6704736998871d9c0cbd64e69f59757a"
SRCREV_qtwebchannel = "de6a637fd62c6635e49351837e7430f039dd2447"
SRCREV_qtwebengine = "f09573711c9a400dafe56536c90a54170c017699"
SRCREV_qtwebengine-chromium = "bb174833724aa009b9b0fac37b2bb72916fa8e34"
SRCREV_qtwebsockets = "6378c341b36e05a6a8986a867d4d13ecc258a7cb"
SRCREV_qtwebview = "e177d81e95d47a889009fcef1a66a6ef3eb154c6"
SRCREV_qtquick3dphysics = "8cad034efc6073aa9ae2ec136f7a3f8d3a1a4aca"
SRCREV_qtquickdesigner-components = "20397e26370ff073125fd19f77c7ad013276b5bd"
SRCREV_qtquicktimeline = "0621c75c2c8a9bc1a3b2d4349db4eb511bcc8887"
SRCREV_qtremoteobjects = "f578c9159640e458034e5e30f316384baf0413b0"
SRCREV_qtscxml = "0cd75c199b15ab2f7368639a42fc2fba1d9d8de5"
SRCREV_qtsensors = "1848f8ad956c7e11ecd3bde59e7c87d88e613299"
SRCREV_qtserialbus = "3e1f7d0e8db211c3d2b0b18785bd6110ed7b2da2"
SRCREV_qtserialport = "e8100bf52b6315946957856702d4d0f10fe9074b"
SRCREV_qtshadertools = "37e474b762e1a158f021eaf7c2df272fb8d00248"
SRCREV_qtspeech = "2878be057eff39a93a313ea713294e326a217cc6"
SRCREV_qtsvg = "c30edb99512d3a121d6bf0907ddac7e91581ead7"
SRCREV_qttools = "6444be988641a3a96a49fb39f28af2c532397e65"
SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2"
SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737"
SRCREV_qttranslations = "b677de52b0d12c6cad7c13e6f4cf26595bfac9ab"
SRCREV_qtvirtualkeyboard = "74724337c98b1b678e17ace1b133a05cf21c3c36"
SRCREV_qtwayland = "51899df4b8744ee685b69b7145591db5e26aefa8"
SRCREV_qtwebchannel = "5aa9ec6e2462aa85f8c8d6896b601b02f14b8367"
SRCREV_qtwebengine = "14d35642a2bf064df7f2a22002b19e2e410f0208"
SRCREV_qtwebengine-chromium = "bbefe10601f984a167699bf78abff2a8b8ed7991"
SRCREV_qtwebsockets = "702e1fdcdb4caf44715afc1523c16ca2c80fcf77"
SRCREV_qtwebview = "ff59e23f40555001abcaab698add69255190371b"

View File

@ -10,6 +10,8 @@ DEBUG_PREFIX_MAP += "\
-fmacro-prefix-map=${D}= \
"
do_install_ptest_base[progress] = "${@d.getVarFlag('do_compile', 'progress')}"
fakeroot do_install_ptest() {
cat >${WORKDIR}/toolchain-ptest.cmake <<EOF
include(${WORKDIR}/toolchain.cmake)

View File

@ -127,3 +127,4 @@ FILES:${PN}-examples = " \
${QT6_INSTALL_EXAMPLESDIR} \
${prefix}/examples \
"
RDEPENDS:${PN}-examples = "${PN}"

View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native"

View File

@ -1,4 +1,4 @@
From 7e15934773ea428c2a35f80a0485f700ad9891cf Mon Sep 17 00:00:00 2001
From a08e167d51c33f91009ba27adaa083c783c1ac54 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 15 Apr 2013 04:29:32 +0200
Subject: [PATCH] Add linux-oe-g++ platform
@ -12,6 +12,7 @@ Upstream-Status: Inappropriate [embedded specific]
Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
mkspecs/features/qt.prf | 6 ++---
mkspecs/features/qt_functions.prf | 4 +--
@ -24,19 +25,19 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
create mode 100644 mkspecs/oe-device-extra.pri
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 729f3ac73d..84efd90d47 100644
index 3c4b284b68..a7545ace5c 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -150,7 +150,7 @@ import_plugins:qtConfig(static) {
plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
@@ -164,7 +164,7 @@ import_plugins {
plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix($$config_variable).$$QMAKE_EXTENSION_STATICLIB
plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
isEmpty(plug_path): \
- plug_path = $$[QT_INSTALL_PLUGINS/get]
+ plug_path = $$[QT_INSTALL_PLUGINS]
LIBS += $$plug_path/$$plug_type/$$plug_name
} else {
LIBS += -l$${plug}$$qtPlatformTargetSuffix()
@@ -283,8 +283,8 @@ for(ever) {
LIBS += -l$${plug}$$qtPlatformTargetSuffix(CONFIG)
@@ -319,8 +319,8 @@ for(ever) {
# static builds: link qml import plugins into the target.
contains(all_qt_module_deps, qml): \
qtConfig(static):import_plugins:!host_build:!no_import_scan {
@ -48,10 +49,10 @@ index 729f3ac73d..84efd90d47 100644
# run qmlimportscanner
qtPrepareLibExecTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index dd780ad556..0664ef789e 100644
index f1371c8cc6..84cbf4a476 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -91,7 +91,7 @@ defineTest(qtPrepareTool) {
@@ -95,7 +95,7 @@ defineTest(qtPrepareTool) {
cmd = $$eval(QT_TOOL.$${2}.binary)
isEmpty(cmd) {
isEmpty(5) {
@ -60,7 +61,7 @@ index dd780ad556..0664ef789e 100644
} else {
instloc = $$5
}
@@ -136,7 +136,7 @@ defineTest(qtPrepareTool) {
@@ -140,7 +140,7 @@ defineTest(qtPrepareTool) {
# Forwards its arguments to qtPrepareTool but defaults the installation location to
# $$[QT_HOST_LIBEXECS]
defineTest(qtPrepareLibExecTool) {

View File

@ -1,4 +1,4 @@
From bc9476229b98e567420e177a8ede27fd28451895 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
@ -20,12 +20,12 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index a4764713c4..0fc456472d 100644
index 92729b06f1..dac7857600 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -126,7 +126,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");

View File

@ -7,15 +7,16 @@ Build tests without location of the build and sources directories.
Upstream-Status: Inappropriate [embedded specific]
Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2
---
src/testlib/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
index 03deb2edc9..972b366532 100644
index 6cdb8f3376..3007585e1c 100644
--- a/src/testlib/CMakeLists.txt
+++ b/src/testlib/CMakeLists.txt
@@ -125,8 +125,8 @@ set(qt_tc_build_dir_def
@@ -121,8 +121,8 @@ set(qt_tc_build_dir_def
"$<IF:${qt_bool_tc_build_dir},${qt_tc_build_dir},$<TARGET_PROPERTY:BINARY_DIR>>"
)
set_property(TARGET Test APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS
@ -25,4 +26,4 @@ index 03deb2edc9..972b366532 100644
+ QT_TESTCASE_SOURCEDIR=""
)
# special case begin
qt_internal_add_docs(Test

View File

@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
include recipes-qt/qt6/conan.inc
@ -33,9 +34,11 @@ DEPENDS += "\
DEPENDS:remove:class-native = "qtbase-native"
RDEPENDS_${PN}:remove:class-native = "libssl-native"
RRECOMMENDS:${PN}:append:class-target = " locale-base-c"
RRECOMMENDS:${PN}-ptest:append = " tzdata"
PACKAGECONFIG:class-native ?= "\
gui widgets jpeg png dbus no-opengl openssl zlib \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
gui widgets jpeg png dbus no-opengl openssl zlib zstd \
"
PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
PACKAGECONFIG ?= "\
@ -51,18 +54,33 @@ PACKAGECONFIG ?= "\
PACKAGECONFIG_GRAPHICS ?= "\
${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'gles2 eglfs', d), 'no-opengl linuxfb', d)} \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'kms gbm gles2 eglfs', d), 'no-opengl linuxfb', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
"
PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xkbcommon glib', '', d)}"
PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)}"
PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups kms gbm sql-sqlite', '', d)}"
PACKAGECONFIG_FONTS ?= ""
PACKAGECONFIG_SYSTEM ?= ""
PACKAGECONFIG_DISTRO ?= ""
PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev gui widgets icu openssl \
jpeg png dbus libinput fontconfig harfbuzz zlib \
PACKAGECONFIG_DEFAULT ?= "\
accessibility \
dbus \
fontconfig \
glib \
gui \
harfbuzz \
icu \
jpeg \
libinput \
${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'use-gold-linker', '', d)} \
openssl \
png \
udev \
widgets \
xkbcommon \
zlib \
zstd \
${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
"
PACKAGECONFIG:remove:mingw32 = "openssl"
@ -76,10 +94,15 @@ OPENSSL_LINKING_MODE ?= "runtime"
QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \
bb.utils.contains('PACKAGECONFIG', 'gles2', 'eglfs', 'linuxfb', d), d)}"
# at-spi bridge requires XCB currently
ACCESSIBILITY_DEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "at-spi2-core", "", d)}"
PACKAGECONFIG[ltcg] = "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON,-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF"
PACKAGECONFIG[optimize-size] = "-DFEATURE_optimize_size=ON,-DFEATURE_optimize_size=OFF"
PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-DFEATURE_developer_build=OFF"
PACKAGECONFIG[use-gold-linker] = "-DFEATURE_use_gold_linker=ON"
PACKAGECONFIG[use-bfd-linker] = "-DFEATURE_use_bfd_linker=ON"
PACKAGECONFIG[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups"
PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus"
@ -95,13 +118,14 @@ PACKAGECONFIG[lttng] = "-DFEATURE_lttng=ON,-DFEATURE_lttng=OFF,lttng-ust"
# gui
PACKAGECONFIG[gui] = "-DFEATURE_gui=ON,-DFEATURE_gui=OFF"
PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF"
PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF,${ACCESSIBILITY_DEPENDS}"
PACKAGECONFIG[directfb] = "-DFEATURE_directfb=ON,-DFEATURE_directfb=OFF,directfb"
PACKAGECONFIG[fontconfig] = "-DFEATURE_fontconfig=ON,-DFEATURE_fontconfig=OFF,fontconfig"
PACKAGECONFIG[gbm] = "-DFEATURE_gbm=ON,-DFEATURE_gbm=OFF,virtual/libgbm"
PACKAGECONFIG[gl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
PACKAGECONFIG[gles2] = "-DFEATURE_opengles2=ON,-DFEATURE_opengles2=OFF,virtual/libgles2 virtual/egl"
PACKAGECONFIG[eglfs] = "-DFEATURE_eglfs=ON,-DFEATURE_eglfs=OFF"
PACKAGECONFIG[eglfs-egldevice] = "-DFEATURE_eglfs_egldevice=ON,-DFEATURE_eglfs_egldevice=OFF"
PACKAGECONFIG[harfbuzz] = "-DFEATURE_harfbuzz=ON,-DFEATURE_harfbuzz=OFF,harfbuzz"
PACKAGECONFIG[jpeg] = "-DFEATURE_jpeg=ON,-DFEATURE_jpeg=OFF,jpeg"
PACKAGECONFIG[kms] = "-DFEATURE_kms=ON,-DFEATURE_kms=OFF,drm virtual/egl"
@ -109,7 +133,7 @@ PACKAGECONFIG[libinput] = "-DFEATURE_libinput=ON,-DFEATURE_libinput=OFF,libinput
PACKAGECONFIG[linuxfb] = "-DFEATURE_linuxfb=ON,-DFEATURE_linuxfb=OFF"
PACKAGECONFIG[mtdev] = "-DFEATURE_mtdev=ON,-DFEATURE_mtdev=OFF,mtdev"
PACKAGECONFIG[no-opengl] = "-DINPUT_opengl=no"
PACKAGECONFIG[png] = "-DFEATURE_png=ON,-DFEATURE_png=OFF,libpng"
PACKAGECONFIG[png] = "-DFEATURE_system_png=ON,-DFEATURE_png=OFF,libpng"
PACKAGECONFIG[tslib] = "-DFEATURE_tslib=ON,-DFEATURE_tslib=OFF,tslib"
PACKAGECONFIG[vulkan] = "-DFEATURE_vulkan=ON,-DFEATURE_vulkan=OFF,vulkan-headers,vulkan-loader"
PACKAGECONFIG[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-cursor"
@ -140,8 +164,8 @@ EXTRA_OECMAKE += "\
EXTRA_OECMAKE:append:class-target = "\
-DFEATURE_rpath=OFF \
-DFEATURE_relocatable=OFF \
-DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-DFEATURE_use_gold_linker=ON', '-DFEATURE_use_bfd_linker=ON', d)} \
"
EXTRA_OECMAKE:append:mingw32 = "\
@ -151,7 +175,7 @@ EXTRA_OECMAKE:append:mingw32 = "\
SYSROOT_DIRS += "${QT6_INSTALL_MKSPECSDIR}"
do_install:append() {
sed -i ${D}${libdir}/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake \
sed -i ${D}${QT6_INSTALL_LIBDIR}/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake \
-e '/QT_SOURCE_TREE/,+2d'
sed -i ${D}${QT6_INSTALL_LIBDIR}/cmake/Qt6/Qt6Dependencies.cmake \
@ -177,6 +201,7 @@ EOF
RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_BINDIR'))}"
sed -i ${D}${QT6_INSTALL_BINDIR}/* \
-i ${D}${QT6_INSTALL_LIBEXECDIR}/* \
-e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
-e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"
@ -185,6 +210,28 @@ EOF
-e "s|/.*/toolchain.cmake|\${CMAKE_CURRENT_LIST_DIR}/$RELPATH|"
}
do_install:append:class-target() {
sed >> ${D}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf <<EOF \
-e 's: ${lcl_maybe_fortify}: :' \
-e 's:${DEBUG_PREFIX_MAP}::' \
-e 's:${RECIPE_SYSROOT}:$$[QT_SYSROOT]:' \
-e 's:${TARGET_PREFIX}:$$[QT_HOST_PREFIX]${bindir}/${TARGET_SYS}/${TARGET_PREFIX}:'
isEmpty(QMAKE_CC): {
QMAKE_AR = ${AR} cqs
QMAKE_AR_LTCG = ${HOST_PREFIX}gcc-ar cqs
QMAKE_STRIP = ${STRIP}
QMAKE_OBJCOPY = ${OBJCOPY}
QMAKE_CC = ${HOST_PREFIX}gcc
QMAKE_CFLAGS += ${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS}
QMAKE_CXX = ${HOST_PREFIX}g++
QMAKE_CXXFLAGS += ${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS}
QMAKE_LINK = ${HOST_PREFIX}g++
QMAKE_LFLAGS += ${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_LDFLAGS}
}
EOF
}
INSANE_SKIP:${PN}-ptest += "arch"
INHIBIT_PACKAGE_STRIP_FILES = "\
${PKGD}${PTEST_PATH}/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so \

View File

@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -12,11 +12,9 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
# QTBUG-93565
PTEST_ENABLED = "0"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"

View File

@ -6,9 +6,12 @@ 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-lts.inc
include recipes-qt/qt6/qt6.inc
REQUIRED_DISTRO_FEATURES = "opengl"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

View File

@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver"

View File

@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
inherit qt6-cmake
include recipes-qt/qt6/qt6.inc
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
RDEPENDS:${PN} = "connman"

View File

@ -11,8 +11,11 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtgrpc-native protobuf protobuf-native"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
BBCLASSEXTEND = "native nativesdk"

View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -0,0 +1,12 @@
LICENSE = "The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = "file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
include recipes-qt/qt6/qt6-commercial.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
FILES:${PN} += "${QT6_INSTALL_DATADIR}/qtinsight"

View File

@ -11,13 +11,9 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
python() {
if 'meta-python' not in d.getVar('BBFILE_COLLECTIONS').split():
raise bb.parse.SkipRecipe('Requires meta-python to be present.')
}
# Default build and package these
REFERENCE_API ?= "1"
SIMULATION_SUPPORT ?= "1"

View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtpositioning"

View File

@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -16,15 +16,24 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtshadertools qtshadertools-native"
PACKAGECONFIG ?= "gstreamer pulseaudio qml"
PACKAGECONFIG ?= "\
${@bb.utils.contains_any('LICENSE_FLAGS_ACCEPTED','commercial commercial_ffmpeg','ffmpeg','',d)} \
gstreamer pulseaudio qml spatialaudio spatialaudio_quick3d"
PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtsvg"
PACKAGECONFIG[ffmpeg] = "-DFEATURE_ffmpeg=ON,-DFEATURE_ffmpeg=OFF,ffmpeg"
PACKAGECONFIG[gstreamer] = "-DFEATURE_gstreamer=ON,-DFEATURE_gstreamer=OFF,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pulseaudio"
PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
PACKAGECONFIG[spatialaudio] = "-DFEATURE_spatialaudio=ON,-DFEATURE_spatialaudio=OFF"
PACKAGECONFIG[spatialaudio_quick3d] = "-DFEATURE_spatialaudio_quick3d=ON,-DFEATURE_spatialaudio_quick3d=OFF,qtquick3d qtquick3d-native"
PACKAGECONFIG[vaapi] = "-DFEATURE_vaapi=ON,-DFEATURE_vaapi=OFF,libva"
QT_DEFAULT_MEDIA_BACKEND ?= "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer', 'gstreamer', 'ffmpeg', d)}"
EXTRA_OECMAKE += "-DQT_DEFAULT_MEDIA_BACKEND=${QT_DEFAULT_MEDIA_BACKEND}"

View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -18,6 +18,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
PACKAGECONFIG ?= "qml"

View File

@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -5,6 +5,8 @@ Subject: [PATCH] Skip embree on mingw
Build fails with older mingw headers, skip it complete since
it's not needed for the toolchain.
Upstream-Status: Inappropriate [OE Specific]
---
src/3rdparty/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

View File

@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
ASSIMP_BRANCH = "qt6_assimp"

View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
COMPATIBLE_MACHINE = "(-)"

View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative qtdeclarative-native"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtscxml-native"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -13,9 +13,14 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtshadertools-native"
DEPENDS:append:class-native = " spirv-tools-native"
RDEPENDS:${PN}-tools = "spirv-tools"
RDEPENDS:${PN}-tools:remove:mingw32 = "spirv-tools"
BBCLASSEXTEND = "native nativesdk"

View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += " \
@ -24,6 +25,8 @@ SRC_URI += " \
DEPENDS += "qtbase qtdeclarative qttools-native"
PACKAGECONFIG[clang] = "-DFEATURE_clang=ON,-DFEATURE_clang=OFF,clang"
FILES:${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
BBCLASSEXTEND = "native nativesdk"

View File

@ -8,11 +8,12 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qttools qttools-native"
PACKAGES = "${PN}"
PACKAGES = "${PN} ${PN}-dev"
PACKAGES_DYNAMIC = "${PN}-*"
PACKAGESPLITFUNCS:prepend = "split_translation_packages "
@ -27,3 +28,4 @@ python split_translation_packages () {
d.setVar('RRECOMMENDS:' + pn, ' '.join(pkgs))
}
FILES:${PN}-dev = "${QT6_INSTALL_TRANSLATIONSDIR}/catalogs.json"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
# To enabled Nuance T9 Write support, you need to provide the licensed components

View File

@ -10,3 +10,4 @@ include recipes-qt/qt6/qt6-commercial.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwayland qtwayland-native"
PACKAGECONFIG[libtomcrypt] = ",,libtomcrypt"

View File

@ -1,21 +1,22 @@
From 2a4f01d115ce9a69a71ac8c028e1c9cae9db63b3 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
Change-Id: I15aa5fc5128fcd0925d5950596bd56710b5b81d4
Upstream-Status: Inappropriate [OE Specific]
---
CMakeLists.txt | 5 -----
src/CMakeLists.txt | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 642afabb..08365f2d 100644
index c498e15b..21fadd02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,11 +21,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
BuildInternals
@@ -18,11 +18,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
)
qt_internal_project_setup()
-if(NOT MACOS AND NOT QNX AND (ANDROID OR NOT LINUX))
- message(NOTICE "Skipping the build as the condition \"LINUX OR MACOS OR QNX\" is not met.")
@ -26,12 +27,12 @@ index 642afabb..08365f2d 100644
Core
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8e60f0ba..4b2639e3 100644
index a38d9551..c4fe5fb1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@
qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner)
qt_find_package(Wayland 1.15 PROVIDED_TARGETS Wayland::Client Wayland::Server)
@@ -20,7 +20,7 @@ endforeach()
qt_find_package(Wayland 1.15 PROVIDED_TARGETS ${wayland_libs})
-if (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND)
+if ((QT_FEATURE_wayland_server OR QT_FEATURE_wayland_client) AND (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND))

View File

@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
SRC_URI +="\
@ -30,9 +31,6 @@ PACKAGECONFIG:class-nativesdk ?= ""
PACKAGECONFIG[wayland-client] = "-DFEATURE_wayland_client=ON,-DFEATURE_wayland_client=OFF,"
PACKAGECONFIG[wayland-server] = "-DFEATURE_wayland_server=ON,-DFEATURE_wayland_server=OFF,"
PACKAGECONFIG[dmabuf-client-buffer] = "-DFEATURE_wayland_dmabuf_client_buffer=ON,-DFEATURE_wayland_dmabuf_client_buffer=OFF,libdrm"
PACKAGECONFIG[dmabuf-server-buffer] = "-DFEATURE_wayland_dmabuf_server_buffer=ON,-DFEATURE_wayland_dmabuf_server_buffer=OFF,libdrm"
DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND = "native nativesdk"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
inherit gettext
@ -23,7 +24,7 @@ def gettext_oeconf(d):
return ""
QT_MODULE = "qtwebengine"
QT_MODULE_BRANCH_CHROMIUM = "106-based"
QT_MODULE_BRANCH_CHROMIUM = "118-based"
FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
@ -35,7 +36,5 @@ SRC_URI += " \
SRC_URI += " \
file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \
file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
"
SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium"

View File

@ -1,4 +1,4 @@
From 6819917c14b55c4352dbd200bb6ab297bfd243fa Mon Sep 17 00:00:00 2001
From efa68fdedbec60380946f69a6a2f985958148e83 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 18 Aug 2021 15:09:41 +0300
Subject: [PATCH] CMake: use generated yocto toolchains
@ -11,15 +11,15 @@ target binaries where needed.
Upstream-Status: Inappropriate [embedded specific]
Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
---
cmake/Functions.cmake | 8 ++++----
src/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
cmake/Functions.cmake | 12 +++++-------
src/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 89f4cdd39..8845c94f7 100644
index 3371e5ff5..ac889d3f7 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -750,7 +750,7 @@ endfunction()
@@ -819,7 +819,7 @@ endfunction()
macro(create_pkg_config_host_wrapper buildDir)
find_package(PkgConfigHost)
@ -28,24 +28,30 @@ index 89f4cdd39..8845c94f7 100644
create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}")
set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh")
endif()
@@ -979,9 +979,9 @@ endmacro()
macro(append_toolchain_setup)
if(LINUX)
@@ -1097,14 +1097,12 @@ macro(append_toolchain_setup)
elseif(LINUX)
get_gn_arch(cpu ${TEST_architecture_arch})
list(APPEND gnArgArg
- custom_toolchain="${buildDir}/target_toolchain:target"
- host_toolchain="${buildDir}/host_toolchain:host"
- v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8"
+ custom_toolchain="//build/toolchain/yocto:yocto_target"
+ host_toolchain="//build/toolchain/yocto:yocto_native"
+ v8_snapshot_toolchain="//build/toolchain/yocto:yocto_target"
)
get_gn_arch(cpu ${TEST_architecture_arch})
if(CMAKE_CROSSCOMPILING)
- list(APPEND gnArgArg
- v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8"
- target_cpu="${cpu}"
- )
+ list(APPEND gnArgArg target_cpu="${cpu}")
else()
list(APPEND gnArgArg host_cpu="${cpu}")
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 921871bee..c6141988b 100644
index 0084697f2..1c9059ae6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -151,7 +151,7 @@ endif()
@@ -161,7 +161,7 @@ endif()
# HOST PROJECT
##

View File

@ -1,4 +1,4 @@
From 221aefe4d8777f45955cb100dfc4c7204c885a19 Mon Sep 17 00:00:00 2001
From 53bc4f4990e77ef33827ab05813f9562e2b02d10 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 31 Aug 2021 18:27:48 +0300
Subject: [PATCH] Enable examples
@ -6,19 +6,20 @@ Subject: [PATCH] Enable examples
The bug mentioned does not affect bitbake builds.
Change-Id: I076763d9241061f9cdb4d46bcd88e46bd4f783aa
Upstream-Status: Inappropriate [OE Specific]
---
examples/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index ccad90e11..32cd6d69d 100644
index f3b098d0b..f27923f50 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,7 +1,7 @@
@@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.16)
qt_examples_build_begin(EXTERNAL_BUILD)
-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
-if(NOT CMAKE_CROSSCOMPILING AND Qt6Core_VERSION VERSION_GREATER_EQUAL "6.5") #QTBUG-86533
+if(TRUE) #QTBUG-86533
if(TARGET Qt::WebEngineCore)
add_subdirectory(webenginequick)

View File

@ -1,42 +0,0 @@
From 358e7b51c205521dc9eac8a8cf676412078fe014 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 30 Mar 2017 11:37:24 +0300
Subject: [PATCH] chromium: workaround for too long .rps file name
Ninja may fail when the build directory is too long:
ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
le.rsp): Unable to create file. File name too long
Task-number: QTBUG-59769
Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
---
gn/src/gn/ninja_action_target_writer.cc | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gn/src/gn/ninja_action_target_writer.cc b/gn/src/gn/ninja_action_target_writer.cc
index 2ceac904a3c..8496e309cec 100644
--- a/gn/src/gn/ninja_action_target_writer.cc
+++ b/gn/src/gn/ninja_action_target_writer.cc
@@ -122,9 +122,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
// strictly necessary for regular one-shot actions, but it's easier to
// just always define unique_name.
std::string rspfile = custom_rule_name;
+
+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
+ //please note ".$unique_name" is not used at the moment
+ int pos = 0;
+ std::string delimiter("_");
+ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
+ rspfile = rspfile.substr(0,pos);
+
if (!target_->sources().empty())
rspfile += ".$unique_name";
rspfile += ".rsp";
+
out_ << " rspfile = " << rspfile << std::endl;
// Response file contents.

View File

@ -26,25 +26,22 @@ SECURITY_STRINGFORMAT = ""
PACKAGECONFIG ??= "\
${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
geolocation \
glib \
lcms2 \
libevent \
libjpeg \
libpci \
libpng \
libwebp \
zlib \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', '${PACKAGECONFIG_OPENEMBEDDED}', '', d)} \
geolocation \
webchannel \
printing-and-pdf \
pepper-plugins \
spellchecker \
"
PACKAGECONFIG_OPENEMBEDDED ?= "\
lcms2 \
opus \
pepper-plugins \
printing-and-pdf \
snappy \
spellchecker \
webchannel \
webrtc \
zlib \
"
PACKAGECONFIG[alsa] = "-DFEATURE_webengine_system_alsa=ON,-DFEATURE_webengine_system_alsa=OFF,alsa-lib"
@ -86,4 +83,6 @@ FILES:${PN}-tools = ""
# when proprietary-codecs is enabled
INSANE_SKIP:${PN} += "textrel"
QT_PTEST_ENABLED = "0"
# QTBUG-109565 workaround: Disable GCC -O2 on armv7a-neon due to stack alignment issue
FULL_OPTIMIZATION:remove:armv7a = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '-O2', '', d)}"
FULL_OPTIMIZATION:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES', 'neon', ' -O1', '', d)}"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtwebengine"