The eglfs script isn't needed and you should be able to remove +export QT_QPA_PLATFORM=Wayland from qt_env.sh since by setting -qpa Qt already uses the correct one by default.
On Mar 5, 2015, at 7:34 AM, Stiffler, Jacob <[email protected]<mailto:[email protected]>> wrote: Signed-off-by: Jacob Stiffler <[email protected]<mailto:[email protected]>> --- .../recipes-qt/qt5/qtbase/qt_env_eglfs.sh | 5 +++++ .../recipes-qt/qt5/qtbase_5.4.1.bbappend | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/qt_env_eglfs.sh diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env_eglfs.sh b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env_eglfs.sh new file mode 100644 index 0000000..4ae0d9f --- /dev/null +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env_eglfs.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +### QT Environment Variables ### +export QT_QPA_GENERIC_PLUGINS=Auto +export QT_QPA_PLATFORM=eglfs 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..a86aba0 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,16 +5,18 @@ 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 ${ARAGO_QT_PLATOFM}" Base on my other comments you would do a conditional statement to determine which values to use. -SRC_URI += "file://qt_env.sh" +QT_ENV_SCRIPT = "${@base_conditional('ARAGO_QT_PLATFORM', 'eglfs', 'qt_env_eglfs.sh', 'qt_env.sh', d)}" + +SRC_URI += "file://${QT_ENV_SCRIPT}" # Add custom Arago Qt 5 Environment script file do_install_append () { install -d ${D}${sysconfdir}/profile.d - install -m 0644 ${WORKDIR}/qt_env.sh ${D}${sysconfdir}/profile.d/ + install -m 0644 ${WORKDIR}/${QT_ENV_SCRIPT} ${D}${sysconfdir}/profile.d/qt_env.sh } PACKAGES =+ "${PN}-conf" -- 1.7.9.5 _______________________________________________ meta-arago mailing list [email protected]<mailto:[email protected]> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
_______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
