mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
qtbase: update the default graphics configuration
Since embedded graphics stacks seem to focus on GLES over desktop GL, prefer it in the default Qt configuration whenever wayland is enabled in DISTRO_FEATURES. This changes the default for x11 distros where wayland is also enabled. Remove directfb support, it's no longer relevant platform plugin in Qt. Change-Id: I085fb4c94111d84244211ea60254decbf0330fb6 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
This commit is contained in:
parent
5b8d9f8fa3
commit
4cacc39a20
|
|
@ -48,7 +48,6 @@ PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
|
|||
PACKAGECONFIG ?= "\
|
||||
${PACKAGECONFIG_DEFAULT} \
|
||||
${PACKAGECONFIG_GRAPHICS} \
|
||||
${PACKAGECONFIG_X11} \
|
||||
${PACKAGECONFIG_FONTS} \
|
||||
${PACKAGECONFIG_SYSTEM} \
|
||||
${PACKAGECONFIG_DISTRO} \
|
||||
|
|
@ -58,11 +57,13 @@ PACKAGECONFIG_GRAPHICS ?= "\
|
|||
${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
|
||||
bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'kms gbm gles2 eglfs', d), 'no-opengl', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
|
||||
bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms gbm gles2 eglfs', \
|
||||
bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', \
|
||||
'kms gbm gles2 eglfs', d), d), \
|
||||
'no-opengl', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)} \
|
||||
linuxfb \
|
||||
"
|
||||
PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)}"
|
||||
PACKAGECONFIG_FONTS ?= ""
|
||||
PACKAGECONFIG_SYSTEM ?= ""
|
||||
PACKAGECONFIG_DISTRO ?= ""
|
||||
|
|
@ -98,8 +99,12 @@ BUILD_TYPE ?= "Release"
|
|||
OPENSSL_LINKING_MODE ?= "runtime"
|
||||
|
||||
# Default platform plugin
|
||||
QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \
|
||||
bb.utils.contains('PACKAGECONFIG', 'gles2', 'eglfs', 'linuxfb', d), d)}"
|
||||
QT_QPA_DEFAULT_PLATFORM ?= "\
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-egl', \
|
||||
bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \
|
||||
bb.utils.contains('PACKAGECONFIG', 'eglfs', 'eglfs', \
|
||||
'linuxfb', d), d), d)} \
|
||||
"
|
||||
|
||||
PACKAGECONFIG[ltcg] = "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON,-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF"
|
||||
PACKAGECONFIG[optimize-size] = "-DFEATURE_optimize_size=ON,-DFEATURE_optimize_size=OFF"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user