* If WAYLAND_SUPPORT = 0, then use eglfs.
Signed-off-by: Jacob Stiffler <[email protected]>
---
meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh | 1 -
.../recipes-qt/qt5/qtbase_5.4.1.bbappend | 9 ++++++---
2 files changed, 6 insertions(+), 4 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..446a2d9 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
@@ -1,13 +1,16 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
GLES_EXTRA_DEPS = ""
-GLES_EXTRA_DEPS_omap-a15 = "libdrm wayland"
+GLES_EXTRA_DEPS_omap-a15 = " \
+ libdrm \
+ ${@base_conditional('WAYLAND_SUPPORT', '1', 'wayland', '', d)} \
+"
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_conditional('WAYLAND_SUPPORT', '1',
'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
