Commit Graph

671 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
8f36575a9a Update submodule refs on '6.6.1' in yocto/meta-qt6
Change-Id: Ic469167aaa19caf20f6ebcacefb4fa9d155adec6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-20 23:44:58 +00:00
Qt Submodule Update Bot
9655e796ca Update submodule refs on '6.6.1' in yocto/meta-qt6
Change-Id: Ic47eaf5617059dec5b7ab80a893dd30af4c71881
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-20 03:26:31 +00:00
Qt Submodule Update Bot
b294d53057 Update submodule refs on '6.6.1' in yocto/meta-qt6
Change-Id: I6f40855518ee680069f3d67cbdc7fd72b866ab3f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-16 21:10:25 +00:00
Samuli Piippo
0653145013 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: Samuli Piippo <samuli.piippo@qt.io>
2023-11-16 11:15:39 +02:00
Qt Submodule Update Bot
1e564b68e7 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ifbe80bb45826a463692d7453de98a5d8b17c5640
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-13 15:00:50 +00:00
Qt Submodule Update Bot
2ee1961de7 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I12d8721dbd7968a3e43a897415140b90084df50f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-09 10:05:18 +00:00
Samuli Piippo
83b545285b 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.

Pick-to: 6.5
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>
2023-11-06 18:33:38 +00:00
Qt Submodule Update Bot
dc8a253565 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I1a62ba8030cb3374cdb4d129ca6d0a9796b00ff3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-04 05:09:52 +00:00
Qt Submodule Update Bot
344e02ba60 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ideb0532f1a5bed8845f7f6c4cd30fbceceff4b46
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-02 21:17:50 +00:00
Qt Submodule Update Bot
fe79790cfa Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I3cd3b23eaa7c8f5c6b347fe5d1ed71d4de4ec731
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-31 02:06:36 +00:00
Samuli Piippo
3b9ed8a29d 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."

Pick-to: 6.5
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>
2023-10-19 09:47:39 +00:00
Samuli Piippo
c619e94c9b 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.

Pick-to: 6.5
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>
2023-10-18 21:12:26 +00:00
Martin Jansa
6270297ae7 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']

Pick-to: 6.5
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>
2023-10-18 21:12:26 +00:00
Qt Submodule Update Bot
03785ec2f1 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I5795c84df965cdcc01b190346ee32c1565464a62
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-18 15:36:20 +00:00
Samuli Piippo
07fa80f4b4 qtgraphs: remove opengl requirement
QtGraphs no longer requires opengl to work.

Change-Id: I03e166dc2d4265b74156f17d56ba4e20bc180bfd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 3df4dfb2e2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-10-17 17:02:53 +00:00
Michal Klocek
bdbb28f362 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
Pick-to: dev
Change-Id: I94a610c4562463f5de3f8bbb29915e05cf40e640
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-16 04:18:49 +00:00
Qt Submodule Update Bot
7292470324 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ief0a0a2dcd1a371f014ebf2ab28b7135c0482d9c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-16 04:18:47 +00:00
Samuli Piippo
cc229bfa36 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.

Pick-to: 6.5
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>
2023-10-12 16:58:41 +00:00
Qt Submodule Update Bot
8e151f0640 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I2ea9492213874a4994920dac00a8b23c96ce6dbf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-11 09:14:46 +00:00
Qt Submodule Update Bot
f0bc44e14b Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Idac64a01c3f8ee7e8daecbe328027c8703a78e14
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-06 18:07:18 +00:00
Qt Submodule Update Bot
6781b39225 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ia01bbecdb8082f25947edd9d056803ad5a83f3ed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-05 16:16:42 +00:00
Qt Submodule Update Bot
bf3725e45e Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I2237be9ace356915296aeb4378fd8bc51c090704
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-03 00:48:33 +00:00
Andreas Cord-Landwehr
a50132b5da qtbase: add at-spi2-core as dependency for accessibility option
Without at-spi2-core the SPI bridge API is not being built.

Pick-to: 6.5
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>
2023-10-02 18:28:58 +00:00
Samuli Piippo
1ba070272e 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.

Pick-to: 6.5
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>
2023-10-02 14:37:24 +00:00
Samuli Piippo
cc05190dfa readme: Add link to bug tracker
Pick-to: 6.5
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>
2023-10-02 14:37:24 +00:00
Qt Submodule Update Bot
0cdaf2fdd5 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I177ebb4eac18d0ed4b1cb87822d796430bb3de48
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-26 18:16:21 +00:00
Qt Submodule Update Bot
f5dfe0425d Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ia6b06d3eeffb5b53045ac61ef134aabb3ac5ae20
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-25 16:56:06 +00:00
Qt Submodule Update Bot
b5563a55d1 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I88401cde85a028694c603f7d3db446289c7b081e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-22 20:58:07 +00:00
Qt Submodule Update Bot
ee6bdd0bf8 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ia088ae8007d17e2de86ffdca7ef28b22d210f620
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-21 09:19:46 +00:00
Qt Submodule Update Bot
5e3d27ef4b Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: I349857da3bc92d8f67b57d39dfa4d5f402954f59
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-19 19:54:01 +00:00
Samuli Piippo
5695e5a52e Revert "qtwebengine: fix build without DRI"
This reverts commit 9ef6d50fa2.
Patch was merged upstream.

Pick-to: dev
Change-Id: I967fe401fe91fdf4776b3a9646c5db98bd6b0f3b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-09-18 08:32:18 +03:00
Qt Submodule Update Bot
afe07957a5 Update submodule refs on '6.6' in yocto/meta-qt6
Change-Id: Ie04132582b0c7bcb9890db4aaa88abf8c1a70895
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-18 05:32:08 +00:00
Mikko Gronoff
c89ca44d44 Bump version to 6.6.1
Change-Id: Ieab6ee691c12e64dbe005b83c50ff3140a095c0b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-09-14 12:50:57 +03: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