summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-02-07 04:10:06 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-19 11:56:32 +0100
commit4b7182a3be2b591e8190ff15b7a121191e4b201f (patch)
treec518a426110cae5e5355dc5d02bdcf60a2cf2834 /recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch
parent79944bda32a7e4799e7e73ea5b0dfc71ff1fc172 (diff)
downloadmeta-qt5-4b7182a3be2b591e8190ff15b7a121191e4b201f.tar.gz
qt5: Upgrade from 5.2.0 to 5.2.1
* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a * qtdeclarative, qtserialport: Update QT_MODULE_BRANCH * SHA-1 of v5.2.1 tag is only in release branch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch
deleted file mode 100644
index 5b5d18f0..00000000
--- a/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 2af1da07715288bf7fc7308e2d11aef3171c9590 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/14] 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.5.2
35