summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorDaniel Giurcanu <gdanielgwork@googlemail.com>2013-12-17 14:48:05 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-18 21:57:44 +0100
commitdbf3c559daba62d9411eb31a3204487397d41d44 (patch)
tree01e65c4c87554ac3cfe21b03ae29f255a25ec850 /src/plugins
parent1e44ff671e3e4f82f0835da6ec7558cfc2a7c4a6 (diff)
tslib: Derive default device value from TSLIB_TSDEVICE environment variable
Most devices that use tslib have the device path defined by the TSLIB_TSDEVICE env. variable. Change-Id: I89fc17cb2c7fba7741de2fd348aacd608cb21a2a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/generic/tslib/qtslib.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp
index 6986fd5dfa..773939b485 100644
--- a/src/plugins/generic/tslib/qtslib.cpp
+++ b/src/plugins/generic/tslib/qtslib.cpp
@@ -64,7 +64,10 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
qDebug() << "QTsLibMouseHandler" << key << specification;
setObjectName(QLatin1String("TSLib Mouse Handler"));
- QByteArray device = "/dev/input/event1";
+ QByteArray device = qgetenv("TSLIB_TSDEVICE");
+ if (device.isEmpty())
+ device = QByteArrayLiteral("/dev/input/event1");
+
if (specification.startsWith("/dev/"))
device = specification.toLocal8Bit();