diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-21 17:06:20 +0000 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-25 11:22:39 +0000 |
| commit | b966ab7f6cbb1c4b0f7bedd35b92499435e1f50d (patch) | |
| tree | 831bb80f83fa0a0872c35edbb8f8df2636f59700 /meta-agl-core/conf | |
| parent | d21658f508c70859907f4c1687b623cadaf2c3d3 (diff) | |
meta-qt6 uprev: bring back dynamic layer and re-enable wayland-egl as default
This brings back the dynamic layer for qt6 and sets our default to
wayland-egl. The QtLocation bbappend has been dropped, as the MapBox
backend is no longer supported.
This fixes the apps being displayed.
Bug-AGL: SPEC-5294
Change-Id: I214f63ebaf2186cdd5281361cbe31c0c8c8bcda5
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30540
ci-image-build: Jenkins Job builder account
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Diffstat (limited to 'meta-agl-core/conf')
| -rw-r--r-- | meta-agl-core/conf/layer.conf | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-agl-core/conf/layer.conf b/meta-agl-core/conf/layer.conf index 6a0b20d97..a354fbe33 100644 --- a/meta-agl-core/conf/layer.conf +++ b/meta-agl-core/conf/layer.conf @@ -16,11 +16,9 @@ BBFILES_DYNAMIC += " \ selinux:${LAYERDIR}/dynamic-layers/meta-selinux/*/*/*.bb \ selinux:${LAYERDIR}/dynamic-layers/meta-selinux/*/*/*.bbappend \ \ + qt6-layer:${LAYERDIR}/dynamic-layers/meta-qt6/*/*/*.bb \ + qt6-layer:${LAYERDIR}/dynamic-layers/meta-qt6/*/*/*.bbappend \ " -# migrate to meta-qt6 -# qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bb \ -# qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bbappend \ -# LAYERSERIES_COMPAT_aglcore = "scarthgap" LAYERDEPENDS_aglcore = "core" |