Commit Graph

665 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
8a047bd3be Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ie5705beb5bf5691f6fdc19bd048268ab7c3a294c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-20 05:44:58 +00:00
Samuli Piippo
511db28072 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.6 6.5
Change-Id: I6eaee9aa74681cfb70fb738d966cd7381f4bcdb0
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2023-10-19 05:25:43 +00:00
Samuli Piippo
bc1179c5a3 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.6 6.5
Change-Id: Ia70658e0c64b916c9d36ad9aca4c40172b86b5b6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-18 12:39:59 +00:00
Martin Jansa
2713f52a6f 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.6 6.5
Change-Id: I616e03e3a259e532e4ccd6ec87a2975c063837fc
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-18 12:39:51 +00:00
Samuli Piippo
3df4dfb2e2 qtgraphs: remove opengl requirement
QtGraphs no longer requires opengl to work.

Pick-to: 6.6
Change-Id: I03e166dc2d4265b74156f17d56ba4e20bc180bfd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-17 11:45:51 +00:00
Qt Submodule Update Bot
6ec6b62dad Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I763565f0920efb1bf17cd424334098ab08a03685
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-12 16:58:36 +00:00
Samuli Piippo
4b5f7744d4 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.6 6.5
Change-Id: I98b56f4ff1c9dc04a0c0df3ab51f908608c52fbd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-12 12:03:32 +00:00
Qt Submodule Update Bot
b091031439 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia8a29b697788adefe484610b307f061639bcc518
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-05 22:40:08 +00:00
Qt Submodule Update Bot
080d5982c0 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ib7afe389db2d60529d36fe2b41f51c299e3074fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-04 13:42:23 +00:00
Samuli Piippo
32e8ea4dce readme: remove notes about webengine testing
Old Yocto releases are no longer supported, so the note about
testing for old releases is no longer relevant.

Change-Id: I49808cd5b2b95ebcb6012b836c7df447d1782475
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-04 13:08:43 +03:00
Samuli Piippo
234a3be0a8 qtapplicationmanager: remove unneeded CFLAGS
Use of execinfo has been fixed in the module, no need
to add flags here.

Change-Id: I65bbb6e304c59d345e2425f5e9da7f8006479925
Reviewed-by: Khem Raj <raj.khem@gmail.com>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-04 10:08:36 +00:00
Samuli Piippo
9566cdd31e qtopcua: add support for native and nativesdk
Starting with Qt 6.7, Qt OPC UA comes with a data type generator.
Add support for native and nativesdk builds.

Change-Id: Ia840870417e39862f04f02ba8da868a5659acd14
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-03 07:43:31 +00:00
Qt Submodule Update Bot
b0041aef2c Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I46cff826d8e052ad53a18a6ccdf05fe241b690dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-03 07:43:06 +00:00
Andreas Cord-Landwehr
806a39f3ac 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.6 6.5
Change-Id: I49232f933b96597fba721473dd7dcf894d60d9cd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-02 16:37:18 +02:00
Samuli Piippo
0f91287175 readme: Add link to bug tracker
Pick-to: 6.6 6.5
Change-Id: Ida7529550d0ef2d816f86d82c1feaa581e0b624f
Reviewed-by: Inkamari Harjula <inkamari.harjula@qt.io>
2023-10-02 11:38:19 +03:00
Samuli Piippo
98eb819c18 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.6 6.5
Change-Id: If23ee18fa7ac7f92f58bf9d09d8e96aedd08b625
Reviewed-by: Inkamari Harjula <inkamari.harjula@qt.io>
2023-10-02 11:38:09 +03:00
Qt Submodule Update Bot
96c3988dab Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia3fe4693cc260c9b8470a00a9f7c6dbc30025258
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-27 11:45:41 +00:00
Samuli Piippo
12b1d381ea Revert "qtbase: fix build with kirkstone"
This reverts commit fd946afc0a.
Fix was merged in qtbase.

Change-Id: I16c05ad1f681a8a92b83c2bad6aa69de8ab2e35f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-09-26 13:53:05 +00:00
Qt Submodule Update Bot
add471f503 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ie43409b68ac47a4f970b2f812a0b14580d60ea4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-25 13:06:09 +00:00
Qt Submodule Update Bot
60deda9f57 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I22fd0a05b06f87f7dc9195a81c4ec0f95ec189d7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-21 10:47:46 +00:00
Qt Submodule Update Bot
6b66a78f1b Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I6ae1be46a869ab5bf5b67253634bf663c69599e5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-19 23:18:58 +00:00
Qt Submodule Update Bot
a674050be5 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I8f14e07947bd37f437c4612908876378566c426d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-18 20:33:30 +00:00
Samuli Piippo
1fd1ae94de 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)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-18 10:01:08 +00:00
Khem Raj
8c738d89dd qtapplicationmanager: Fix build with musl
execinfo is not part of main C library on musl, but we do have a package
providing that, therefore depend on it when using musl.

Change-Id: I99b1651b5a8096a3014be3588a84e21ddac1c761
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-09-13 17:19:49 +00:00
Samuli Piippo
6c221de4fb layer.conf: update LAYERSERIES_COMPAT for nanbield
oe-core as switched to nanbield.

Pick-to: 6.6 6.5
Change-Id: Iebc445cea81d1449f0564f036787c44ba6aa8a87
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-09-11 17:34:56 +00:00
Qt Submodule Update Bot
437af2514a Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I1272826584466e6af0a2f3e9934bdb7ccc302457
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-31 11:36:33 +00:00
Qt Submodule Update Bot
192b21fdf4 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I180e4c23a31daeafa5e9b489658be6bb4ad8a995
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-31 07:01:04 +00:00
Jaeyoon Jung
7c2a20a1c5 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

Pick-to: 6.6 6.5 6.2
Change-Id: I49c88711be4ca09425fa71f8ce8eda88256370f6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-08-30 10:26:02 +00:00
Khem Raj
76801cc905 qtbase: Add locale-base-c only on glibc based targets
Musl e.g. does not provide these locales

Change-Id: I41071c2a2e3eef0fdf653cc80a31f72f22f93893
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-08-29 17:32:54 -07:00
Samuli Piippo
deab0703da 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
Pick-to: 6.6 6.5 6.2
Change-Id: Ic6c5a6c80011dfefc92e1b2d7aadc48cce82ed7a
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-08-28 09:43:33 +00:00
Samuli Piippo
284bfb1174 Conversion script to use new module names
meta-qt6 is planned to be as much as possible a drop-in replacement
for meta-qt5 layer. All the Qt module recipes use the same names as
the ones in meta-qt5. This means that both meta-qt5 and meta-qt6
layers can not be used at the same and adding both Qt5 and Qt6 to
the same image is not possible.

This script does a brute force rename for all the module names to make
it possible to use both layers at the same time. The new module names
get '6' postfix e.g. qtbase6, qtdeclarative6, qtdeclarative6-native.

Since both Qt versions deploy files with same names, the install paths
for either meta-qt5 or meta-qt6 must be changed.

For meta-qt5:

  QT_DIR_NAME  = "/qt5"

For meta-qt6:

  QT6_INSTALL_BINDIR:append = "/qt6"
  QT6_INSTALL_DATADIR:append = "/qt6"
  QT6_INSTALL_PLUGINSDIR:append = "/qt6"
  QT6_INSTALL_QMLDIR:append = "/qt6"
  QT6_INSTALL_TRANSLATIONSDIR:append = "/qt6"
  EXTRANATIVEPATH:append = "/qt6"

configured in a suitable global configuration file.

Change-Id: I141e3b7a2d6c7df8795e67311e06e7a0465de91a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-28 09:43:23 +00:00
Samuli Piippo
7f09ce9d51 qtwebengine: fix build without DRI
Task-number: QTBUG-116152
Change-Id: Idfdf639edf3dd09928f865dafd3f73ffcef1fa7d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9ef6d50fa2)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-25 18:09:49 +00:00
Samuli Piippo
ff3b6d4269 qtdeclarative: add dependency to QtSvg for example
Examples now have dependency to QtSvg, include it if examples
are enabled.

Pick-to: 6.6
Change-Id: Ie049a282456f3647b280b788a3a589c74aeedeba
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-25 08:38:21 +00:00
Qt Submodule Update Bot
c858fd3c0a Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Iebf110c8bb5a489510be6a68e89d47d4dc8d62a4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-25 08:38:19 +00:00
Samuli Piippo
fef57b1545 qtwebengine: fix x86_64 build of ffmpeg
Backport fix from oe-core/ffmpeg.

Pick-to: 6.6 6.5
Change-Id: Id1fec1ef32f3ce8233c57a6caab18457ca3f8a72
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-22 13:03:58 +00:00
Michael Brüning
f6f7f8b569 Use std::size_t instead of int to store position in string
Using int caused a compilation error with GCC 12.

Fixes: QTBUG-115981
Change-Id: I82107b143995ced6de0facb41e9964e42148d402
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7d72d5053a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-22 13:03:53 +00:00
Mikko Gronoff
94ee1bcf16 qtwebengine: update chromium branch
Now using 112 branch.

Change-Id: I193759ca61b6b09c23865a54cb6be3477e67e849
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d40da8f6cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-22 13:03:49 +00:00
Qt Submodule Update Bot
fff78c0a11 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Iec9c4e23d13c5c34584064063e3442a592e5304a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-22 13:03:44 +00:00
Mikko Gronoff
c7ce220082 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>
(cherry picked from commit b2ae9232f6)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-22 13:03:40 +00:00
Samuli Piippo
13b98403f5 spirv-tools: remove bbappend
Dunfell is no longer supported, remove unneeded bbappend.

Change-Id: I1249fd9cd6e2344216f225c2aa9e68b65834a9e6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-22 13:03:36 +00:00
Samuli Piippo
77264c52e7 python: remove duplicate python recipes
The recipes were duplicated from meta-python in order to support
build with dunfell release. Since that is no longer supported,
we can remove the recipes.

Change-Id: I897bf06f62107c2a14a54fcff9f3be0ebcce7f99
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-22 13:03:31 +00:00
Samuli Piippo
fd946afc0a qtbase: fix build with kirkstone
sqlite3 is too old for the current code in qtbase.

Change-Id: I53d31b8d247590a45bf20971758be31f3404629e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-22 13:03:27 +00:00
Samuli Piippo
30dfd502b3 coin: remove langdale from CI tests
Langdale is now EOL, stop testing Qt against it.

Pick-to: 6.6 6.5
Change-Id: Idba5e353ef3ec484e088fe831ed59f54d70b3acf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-22 13:03:22 +00:00
Samuli Piippo
b06c0b1d69 Drop support for older Yocto releases
Kirkstone will be the oldests Yocto release supported by Qt 6.7.
Qt 6.7 will be released in spring 2024, at which point Dunfell
will be EOL.

Change-Id: I8fee78d4d75401a502762e4b28987a07bfdd1af4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Tommi Mänttäri <tommi.manttari@qt.io>
2023-08-22 13:03:16 +00:00
Samuli Piippo
12f78361ed 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.

Pick-to: 6.6 6.5
Change-Id: I1f2699d62d556b538da85aa12d8c2ec91483fb0b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-16 22:16:33 +03:00
Samuli Piippo
90226dfc47 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.

Pick-to: 6.6 6.5
Change-Id: I8aa31de9116048628a55d630ed3296fac28dfec8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-16 19:16:27 +00:00
Samuli Piippo
69a8018ec1 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
Pick-to: 6.6 6.5 6.2
Change-Id: Icce264b1f2bff5f56cf2b40a0420c5001493e236
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-15 12:00:58 +00:00
Samuli Piippo
c0318a6ad8 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
Pick-to: 6.6 6.5 6.2
Change-Id: I5b713d3a65f794da1ab0113cf1d7f69035e29288
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-15 12:00:40 +00:00
Samuli Piippo
21beafaf82 readme: add note about release branches and tags
Pick-to: 6.6 6.5 6.2
Fixes: QTBUG-114723
Change-Id: I2f6b4ce365b53ec7bd96555c0d6fcbea0e7e50cd
Reviewed-by: <inkamari.harjula@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-15 15:00:31 +03:00
Khem Raj
431d1405f8 qtwebview: Match COMPATIBLE_MACHINE with qtwebengine
qtwebview has direct build dependency on qtwebengine and it can be tried
to build in world builds since it does not have same restrictions on
supported hosts as qtwenengine, therefore match it.

Change-Id: I018471bacc232349a5763822daf3131ae32f17c0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-08-15 05:00:23 -07:00