summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 12:47:20 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 15:25:53 +0200
commit1496c6ba34bf95bce67504c72edace1bc2c0a64e (patch)
treeb2f16ae4f756fcfd5b645d29c2a815af94cd89d9 /recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch
parentf8b065ea1174dd1fa7d93359f6826bfc9d23174c (diff)
downloadmeta-qt5-1496c6ba34bf95bce67504c72edace1bc2c0a64e.tar.gz
qtbase: refresh patches
* all patches applied in recipes should be also applied in https://github.com/meta-qt5/qtbase branches to make it easier to upgrade to new version without loosing any patches * apply: 0013-Disable-mkv8snapshot.patch 0014-enables-tslib-device-to-be-read-from-env-variable.patch 0015-qtbase-allow-build-of-examples.patch also for git version, only 0016-configure-add-tslib-support.patch is now 5.0.2 specific (similar patch already applied in stable branch) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch
new file mode 100644
index 00000000..e55ac7a3
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch
@@ -0,0 +1,35 @@
1From 8d037dfbe0b9cffa098c3de7010651590c1d6e6c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Mon, 27 May 2013 18:32:37 +0200
4Subject: [PATCH 14/15] enables tslib device to be read from env variable
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9from :
10https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
11
12Signed-off-by: Eric Bénard <eric@eukrea.com>
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 src/plugins/generic/tslib/qtslib.cpp | 4 +++-
16 1 file changed, 3 insertions(+), 1 deletion(-)
17
18diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp
19index 6986fd5..2ed4a69 100644
20--- a/src/plugins/generic/tslib/qtslib.cpp
21+++ b/src/plugins/generic/tslib/qtslib.cpp
22@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
23 qDebug() << "QTsLibMouseHandler" << key << specification;
24 setObjectName(QLatin1String("TSLib Mouse Handler"));
25
26- QByteArray device = "/dev/input/event1";
27+ QByteArray device = qgetenv("TSLIB_TSDEVICE");
28+ if(device.isEmpty())
29+ device = "/dev/input/event1";
30 if (specification.startsWith("/dev/"))
31 device = specification.toLocal8Bit();
32
33--
341.8.2.1
35