From 3a4ed33140bb5dc1b2bf9e783dd26d5fde7c857b Mon Sep 17 00:00:00 2001
From: Bhooshan Supe <ext-bhooshan.supe@nokia.com>
Date: Tue, 10 Apr 2012 10:57:38 -0700
Subject: Remove input plugins hard libudev dependency

libudev extends the base functionality of these plugins but should not
be mandatory as it is missing on many embedded devices that still
actually require input devices (keyboard and/or mouse and/or
touchscreen) support

Change-Id: Ieeb949f1af5e774578f689a63f47a8c48f546ac1
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
---
 src/plugins/generic/evdevtouch/evdevtouch.pro  | 4 +++-
 src/plugins/generic/evdevtouch/qevdevtouch.cpp | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/plugins/generic/evdevtouch')

diff --git a/src/plugins/generic/evdevtouch/evdevtouch.pro b/src/plugins/generic/evdevtouch/evdevtouch.pro
index 192a87c2a3..c7d298d534 100644
--- a/src/plugins/generic/evdevtouch/evdevtouch.pro
+++ b/src/plugins/generic/evdevtouch/evdevtouch.pro
@@ -16,7 +16,9 @@ QT += core-private platformsupport-private
 OTHER_FILES += \
     evdevtouch.json
 
-LIBS += $$QMAKE_LIBS_LIBUDEV
+contains(QT_CONFIG, libudev) {
+    LIBS += $$QMAKE_LIBS_LIBUDEV
+}
 
 # DEFINES += USE_MTDEV
 
diff --git a/src/plugins/generic/evdevtouch/qevdevtouch.cpp b/src/plugins/generic/evdevtouch/qevdevtouch.cpp
index b702807cab..c9c49839d6 100644
--- a/src/plugins/generic/evdevtouch/qevdevtouch.cpp
+++ b/src/plugins/generic/evdevtouch/qevdevtouch.cpp
@@ -46,7 +46,9 @@
 #include <QGuiApplication>
 #include <QDebug>
 #include <QtCore/private/qcore_unix_p.h>
+#ifndef QT_NO_LIBUDEV
 #include <QtPlatformSupport/private/qudevicehelper_p.h>
+#endif // QT_NO_LIBUDEV
 #include <linux/input.h>
 
 #ifdef USE_MTDEV
@@ -147,6 +149,7 @@ QTouchScreenHandler::QTouchScreenHandler(const QString &spec)
 
     QString dev;
 
+#ifndef QT_NO_LIBUDEV
     // try to let udev scan for already connected devices
     QScopedPointer<QUDeviceHelper> udeviceHelper(QUDeviceHelper::createUDeviceHelper(QUDeviceHelper::UDev_Touchpad | QUDeviceHelper::UDev_Touchscreen, this));
     if (udeviceHelper) {
@@ -156,6 +159,7 @@ QTouchScreenHandler::QTouchScreenHandler(const QString &spec)
         if (devices.size() > 0)
             dev = devices[0];
     }
+#endif // QT_NO_LIBUDEV
 
     if (dev.isEmpty())
         dev = QLatin1String("/dev/input/event0");
-- 
cgit v1.2.3