aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/qt4
diff options
context:
space:
mode:
authorChase Maupin <chasemaupin03@gmail.com>2010-09-10 06:27:24 +0000
committerDenys Dmytriyenko <denis@denix.org>2010-09-27 11:47:49 -0400
commit0c1dfcbe94c9b40b1107b0af56d7b1c91193dd48 (patch)
treeb836ea2617d90c61b98d09fbf2b88695e7c717a7 /recipes/qt4
parent4b75473b417c92b5d54ef541b949943cff2d6725 (diff)
downloadopenembedded-0c1dfcbe94c9b40b1107b0af56d7b1c91193dd48.tar.gz
openembedded-0c1dfcbe94c9b40b1107b0af56d7b1c91193dd48.tar.bz2
openembedded-0c1dfcbe94c9b40b1107b0af56d7b1c91193dd48.zip
qte: only export touchscreen setting if ts exists
* Changed the qte.sh script to check for whether or not the touchscreen exists before exporting QWS_MOUSE_PROTO to use the touchscreen. This is so that devices that don't have a touchscreen can use the regular mouse support. * Bumped the PR Signed-off-by: Chase Maupin <chase.maupin@ti.com> Acked-by: Denys Dmytriyenko <denis@denix.org> Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Diffstat (limited to 'recipes/qt4')
-rw-r--r--recipes/qt4/files/qte.sh8
-rw-r--r--recipes/qt4/qt4-embedded.inc2
2 files changed, 6 insertions, 4 deletions
diff --git a/recipes/qt4/files/qte.sh b/recipes/qt4/files/qte.sh
index ddea77dcf4..21d6ecbd6a 100644
--- a/recipes/qt4/files/qte.sh
+++ b/recipes/qt4/files/qte.sh
@@ -1,5 +1,7 @@
#!/bin/sh
-QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
-
-export QWS_MOUSE_PROTO
+if [ -e /dev/input/touchscreen0 ]
+then
+ QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
+ export QWS_MOUSE_PROTO
+fi
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index d756a29cb0..111716d83b 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS += "directfb tslib"
-INC_PR = "r22"
+INC_PR = "r23"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"