* If wayland is in DISTRO_FEATURES, then configure '-qpa wayland' * Otherwise configure '-qpa eglfs'
Signed-off-by: Jacob Stiffler <[email protected]> --- v2: omap-a15 requires wayland regardless of whether it is a feature. meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh | 1 - .../recipes-qt/qt5/qtbase_5.4.1.bbappend | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh index 1e8c196..f888d50 100644 --- a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh @@ -2,4 +2,3 @@ ### QT Environment Variables ### export QT_QPA_GENERIC_PLUGINS=Auto -export QT_QPA_PLATFORM=wayland diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend index a466581..4af0582 100644 --- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend @@ -5,9 +5,9 @@ GLES_EXTRA_DEPS_omap-a15 = "libdrm wayland" PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}" -PR_append = "-arago3" +PR_append = "-arago4" -QT_CONFIG_FLAGS += "-qpa wayland" +QT_CONFIG_FLAGS += "-qpa ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', 'eglfs', d)}" SRC_URI += "file://qt_env.sh" -- 1.7.9.5 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
