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/dynamic-layers/meta-qt6 | |
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/dynamic-layers/meta-qt6')
-rw-r--r-- | meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_%.bbappend | 1 | ||||
-rw-r--r-- | meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_aglcore.inc | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_%.bbappend b/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_%.bbappend new file mode 100644 index 000000000..aab944c2f --- /dev/null +++ b/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'qtbase_aglcore.inc', '', d)} diff --git a/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_aglcore.inc new file mode 100644 index 000000000..aa8bf1d59 --- /dev/null +++ b/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_aglcore.inc @@ -0,0 +1,12 @@ + +QT_QPA_DEFAULT_PLATFORM = "wayland-egl" + + + +# OLD +#FILESEXTRAPATHS:prepend := "${THISDIR}/qtbase:" +#PACKAGECONFIG_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" +#PACKAGECONFIG:append = " ${PACKAGECONFIG_WAYLAND}" +# '-qpa wayland-egl' set wayland-egl as default of platform plugins +#PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard" +#PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}" |