diff options
author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-05-24 13:41:36 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 03:15:52 +0200 |
commit | 22ef98c0b11f3d2e48af6adce11d79c5d1cae194 (patch) | |
tree | f09b7cc0eb7fb7c59ce3d05e56ab0a515dc4ed8e /src/plugins/generic/tslib/qtslib.cpp | |
parent | dacc3f28521452fcdff3663a7d51cf2ff37311ff (diff) |
Migrate tslib to new plugin format
Also rename the binary and avoid crashes when tslib initialization
fails.
Change-Id: Ia7ccf7c997e1b1484bd475626ca16c9a9642466e
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/generic/tslib/qtslib.cpp')
-rw-r--r-- | src/plugins/generic/tslib/qtslib.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp index 6fec309f9a..369b602c1a 100644 --- a/src/plugins/generic/tslib/qtslib.cpp +++ b/src/plugins/generic/tslib/qtslib.cpp @@ -68,13 +68,16 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, if (specification.startsWith("/dev/")) device = specification.toLocal8Bit(); - m_dev = ts_open(device.constData(), 1); + m_dev = ts_open(device.constData(), 1); + if (!m_dev) { + qErrnoWarning(errno, "ts_open() failed"); + return; + } if (ts_config(m_dev)) { perror("Error configuring\n"); } - m_rawMode = !key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive); int fd = ts_fd(m_dev); |