diff options
author | Eric Bénard <eric@eukrea.com> | 2013-10-07 22:54:12 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-08 15:50:09 +0200 |
commit | 105ad2a18e20f2b07d20a1640917e69950c8496b (patch) | |
tree | a0f86192cabf055168b92b5462ef938e160784f8 /recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch | |
parent | 149e6b6d3730a1ff5431cdfedd2c6dbc623362b9 (diff) | |
download | meta-qt5-105ad2a18e20f2b07d20a1640917e69950c8496b.tar.gz |
qtbase: update to 5.1.1
- patch 10 was update
- patch 19 & 25 are merged so no more needed
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch new file mode 100644 index 00000000..56b4a663 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 3642ea2f7eff14c0835385f28a13514b806eba32 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
3 | Date: Mon, 27 May 2013 18:32:37 +0200 | ||
4 | Subject: [PATCH 14/22] enables tslib device to be read from env variable | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | from : | ||
10 | https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch | ||
11 | |||
12 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
13 | Signed-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 | |||
18 | diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp | ||
19 | index 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 | -- | ||
34 | 1.8.3.1 | ||
35 | |||