From: "Franklin S. Cooper Jr" <[email protected]>

* There are important Qt environment variables that needs to be set and those
  variables are only being set within Matrix's init script.
* This causes problems when your trying to manually run a Qt application
  outside of Matrix since you need to manually export the proper Qt specific
  environment variables again.
* Create a qt_env.sh that contains these Qt specific environment variables and
  install it into /etc/profile.d which will insure these environment variables 
are
  global and the default.

Signed-off-by: Franklin S. Cooper Jr <[email protected]>
---
 meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh  |   12 ++++++++++++
 .../recipes-qt/qt5/qtbase_5.2.1.bbappend           |   18 +++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh

diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh 
b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh
new file mode 100644
index 0000000..51c181f
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+### QT Environment Variables ###
+export QT_QPA_GENERIC_PLUGINS=Auto
+export QT_QPA_PLATFORM=wayland
+
+
+# Set the QT_QPA_GENERIC_PLUGINS for touchscreen if it exists
+if [ -e /dev/input/touchscreen0 ]
+then
+    export QT_QPA_GENERIC_PLUGINS=Tslib:/dev/input/touchscreen0
+fi
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.2.1.bbappend 
b/meta-arago-distro/recipes-qt/qt5/qtbase_5.2.1.bbappend
index f5f772a..446b72a 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.2.1.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.2.1.bbappend
@@ -1,8 +1,24 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
 GLES_EXTRA_DEPS = ""
 GLES_EXTRA_DEPS_omap-a15 = "libdrm wayland"
 
 PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl 
${GLES_EXTRA_DEPS}"
 
-PR_append = "-arago1"
+PR_append = "-arago2"
 
 QT_CONFIG_FLAGS += "-qpa wayland"
+
+SRC_URI += "file://qt_env.sh"
+
+# 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/
+}
+
+PACKAGES =+ "${PN}-conf"
+
+FILES_${PN}-conf = "${sysconfdir}/profile.d/qt_env.sh"
+
+RDEPENDS_${PN} += "${PN}-conf"
-- 
1.7.9.5

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to