Commit Graph

646 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
6c474cfe4f Update submodule refs on '6.6.0' in yocto/meta-qt6
Change-Id: I539fe2277d845e8101686ca7340874d36926a994
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-04 05:20:24 +00:00
Qt Submodule Update Bot
3929bcb124 Update submodule refs on '6.6.0' in yocto/meta-qt6
Change-Id: I971433d1a5bb38b49d188aa34bdbb474ffa392e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-02 17:24:12 +00:00
Qt Submodule Update Bot
0e89308455 Update submodule refs on '6.6.0' in yocto/meta-qt6
Change-Id: Ieb752245c45f9de57035a464d855a35336492b4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-30 21:21:37 +00:00
Qt Submodule Update Bot
a1c701d30b Update submodule refs on '6.6.0' in yocto/meta-qt6
Change-Id: If3067ff647fb15697a5351aa2e8b704753800222
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-28 20:30:36 +00:00
Qt Submodule Update Bot
c5d4c34d5a Update submodule refs on '6.6.0' in yocto/meta-qt6
Change-Id: Id8ed9997e88cffb1c165b126a54164fd31f4dd54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-27 02:41:59 +00:00
Qt Submodule Update Bot
fb2ba7cda8 Update submodule refs on '6.6.0' in yocto/meta-qt6
Change-Id: I5ebcd80d15a811e67b25699e717b0d3e3f8aada2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-21 21:35:58 +00:00
Samuli Piippo
4ffdbd1dd6 Revert "qtwebengine: fix build without DRI"
This reverts commit 9ef6d50fa2.
Patch was merged upstream.

Change-Id: I967fe401fe91fdf4776b3a9646c5db98bd6b0f3b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 5695e5a52e)
2023-09-21 03:24:50 +00:00
Qt Submodule Update Bot
1a9717d38b Update submodule refs on '6.6.0' in yocto/meta-qt6
Change-Id: If817bb58cef5ba68b61fb6b66a52ba25ed4bf637
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-21 03:24:49 +00:00
Samuli Piippo
4517131d2e layer.conf: update LAYERSERIES_COMPAT for nanbield
oe-core as switched to nanbield.

Pick-to: 6.5
Change-Id: Iebc445cea81d1449f0564f036787c44ba6aa8a87
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 6c221de4fb)
2023-09-12 08:03:46 +00:00
Qt Submodule Update Bot
cb2fe922ad Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: If47184259da02bdf45283ed252501f3362571815
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-12 03:10:27 +00:00
Qt Submodule Update Bot
c4f9d62e7e Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: If00411cca35c2ddd44fc048ea4e14f6d0cc8015a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-01 18:55:50 +00:00
Qt Submodule Update Bot
28b06d9c29 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I36db5d60214e9a029c6a4080dceecfc6696f25b9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-31 00:44:51 +00:00
Jaeyoon Jung
42701bcb12 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
Qt Submodule Update Bot
b7769e14a6 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I3a0da71dcc8401192d3f49fc07c1929646b0b1f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-29 19:40:28 +00:00
Samuli Piippo
05e78180cc 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-29 04:43:43 +00:00
Qt Submodule Update Bot
75ce91384a Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I7c2e18b1b6b4fce9d617394c6309ec42fa5576a9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-29 00:31:30 +00:00
Samuli Piippo
d43d9d2125 qtdeclarative: add dependency to QtSvg for example
Examples now have dependency to QtSvg, include it if examples
are enabled.

Change-Id: Ie049a282456f3647b280b788a3a589c74aeedeba
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ff3b6d4269)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-25 18:09:55 +00:00
Samuli Piippo
5f4d006748 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)
2023-08-25 12:30:43 +00:00
Qt Submodule Update Bot
ed23544934 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ice1289a5cb06390b73646ef819f13b389b37ba31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-24 14:32:02 +00:00
Samuli Piippo
4429d9e5e6 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 13:09:34 +03:00
Qt Submodule Update Bot
8afc481723 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ie483074d25efaf6f1ce5d2a4412a7160968803c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-23 05:39:30 +00:00
Samuli Piippo
9ef6d50fa2 qtwebengine: fix build without DRI
Task-number: QTBUG-116152
Change-Id: Idfdf639edf3dd09928f865dafd3f73ffcef1fa7d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-08-17 06:31:38 +00:00
Qt Submodule Update Bot
65e052b187 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ie1dca396866e96d433506ef52f50e18017eed883
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-17 01:26:38 +00:00
Samuli Piippo
9e316a7c31 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-16 23:05:32 +00:00
Samuli Piippo
dca2c5ed40 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-16 23:05:24 +00:00
Qt Submodule Update Bot
01b84070a5 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ib3ff7967d1920c8fc2dbdc42abcd354602335a8b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-16 04:30:34 +00:00
Mikko Gronoff
d40da8f6cb qtwebengine: update chromium branch
Now using 112 branch.

Pick-to: dev
Change-Id: I193759ca61b6b09c23865a54cb6be3477e67e849
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-08-16 04:30:34 +00:00
Mikko Gronoff
b2ae9232f6 coin: Add workaround for static build in CI
After 35cb20a3556a6987d31090cdc3f77126efceaab0 landed in
qtapplicationmanager we need to disable multi-process pkgconfig in static build to fix build issue:

"ERROR: Feature "am_multi_process": Forcing to "ON" breaks its condition"

Change-Id: Idd901baf72236db2a21c25d5b6a905c1246e0c6a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-08-16 04:30:34 +00:00
Michael Brüning
7d72d5053a Use std::size_t instead of int to store position in string
Using int caused a compilation error with GCC 12.

Pick-to: dev
Fixes: QTBUG-115981
Change-Id: I82107b143995ced6de0facb41e9964e42148d402
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-16 04:30:34 +00:00
Samuli Piippo
48be19bd79 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
4cc6cb1109 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
72015d3360 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
7d08b331d5 *.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:09 +00:00
Qt Submodule Update Bot
68018c2e98 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I7f41c9d4e35e618b30dc16a7ebdf008969eaac2f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-27 13:08:18 +00:00
Samuli Piippo
af841f7c19 Add 6.6 compatibility notes
Update readme for the 6.6 branch compatibility and testing.

Change-Id: Ib093cd11c3fe4c57c511f59fd0cf82f90969c15c
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 8f29099348)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-19 11:31:01 +00:00
Paul Geurts
391a45bac6 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
ac6d295cbe qt6: update module branch
Use correct branch for Qt 6.6.

Change-Id: I87e7fc2dc1779bd81a86a2a670c14afc725fad3e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-06-14 05:48:25 +00:00
Samuli Piippo
abcd9410cd qtwebengine: update patch
Fuzz detected.

Change-Id: I5be6c8841f414a3fe73d0805be6b2b83e667c155
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 4af8539dcf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-12 06:48:59 +00:00
Qt Submodule Update Bot
1c098eb6b2 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I06dfd09e267c067b7b0bda41761bebbec8f4434b
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2023-06-12 09:48:52 +03:00
Samuli Piippo
ca0dbeedb0 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
8b9d5c95ca Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I1745e6fe5ba8ff72116f43acebd740838deb8735
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-31 07:50:46 +00:00
Samuli Piippo
8f67afff3f 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.

Pick-to: 6.5
Change-Id: I63e3835f15c732f57740b6718245e4f45ddb6c8c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-05-29 17:07:17 +00:00
Samuli Piippo
6ad68945b5 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
Pick-to: 6.5 6.2
Change-Id: I48f18488413168afbeffddb9eac58985d1b8a988
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-05-29 04:38:35 +00:00
Samuli Piippo
651610f42f Coin: use correct path for mirror
Pick-to: 6.5 6.2
Change-Id: I878122ac5a34aaf464bb4190e3307793c53eabba
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-05-29 07:38:25 +03:00
Samuli Piippo
30f672a28d qtwayland: update patch
Fuzz detected.

Change-Id: I422205975b9d6acfa67c238bf27fe334fb678727
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-05-29 04:37:29 +00:00
Qt Submodule Update Bot
3571ef11fa Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: If0be552e9c3c6f7699d78333240435f723604d4f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-29 04:37:25 +00:00
Martin Jansa
e1cacf710f 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

Pick-to: 6.5
Change-Id: I503f18ae93a24fe08b66827b4ab2dc5b7562819a
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-05-25 07:23:32 +02:00
Olaf Mandel
16c7da9d10 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.

Pick-to: 6.5
Fixes: QTBUG-113712
Change-Id: If26668e8d901c89be8527ff3951a00d739a89372
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-05-25 07:23:05 +02:00
Qt Submodule Update Bot
cf976a7d83 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I512089793ac3ada9e7a76a3af89fec49ada978ae
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-23 08:58:00 +00:00
Samuli Piippo
6777ad5f22 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.

Pick-to: 6.5
Change-Id: Id866d1facbbff0a50c39fe2e440e64e3cca8a579
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-05-19 04:27:47 +00:00