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/evdevmouse/evdevmouse.pro         | 4 +++-
 src/plugins/generic/evdevmouse/qevdevmousehandler.cpp | 1 -
 src/plugins/generic/evdevmouse/qevdevmousemanager.cpp | 6 ++++++
 src/plugins/generic/evdevmouse/qevdevmousemanager.h   | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

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

diff --git a/src/plugins/generic/evdevmouse/evdevmouse.pro b/src/plugins/generic/evdevmouse/evdevmouse.pro
index f322a5bd1a..fb9c0e71b8 100644
--- a/src/plugins/generic/evdevmouse/evdevmouse.pro
+++ b/src/plugins/generic/evdevmouse/evdevmouse.pro
@@ -17,4 +17,6 @@ SOURCES = main.cpp \
 OTHER_FILES += \
     evdevmouse.json
 
-LIBS += $$QMAKE_LIBS_LIBUDEV
+contains(QT_CONFIG, libudev) {
+    LIBS += $$QMAKE_LIBS_LIBUDEV
+}
diff --git a/src/plugins/generic/evdevmouse/qevdevmousehandler.cpp b/src/plugins/generic/evdevmouse/qevdevmousehandler.cpp
index 1821c2b06b..7c05e9ff11 100644
--- a/src/plugins/generic/evdevmouse/qevdevmousehandler.cpp
+++ b/src/plugins/generic/evdevmouse/qevdevmousehandler.cpp
@@ -48,7 +48,6 @@
 
 #include <qplatformdefs.h>
 #include <private/qcore_unix_p.h> // overrides QT_OPEN
-#include <QtPlatformSupport/private/qudevicehelper_p.h>
 
 #include <errno.h>
 
diff --git a/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp b/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp
index f8e77abe55..cf3fe1f498 100644
--- a/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp
+++ b/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp
@@ -56,7 +56,11 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
 {
     Q_UNUSED(key);
 
+#ifndef QT_NO_LIBUDEV
     bool useUDev = true;
+#else
+    bool useUDev = false;
+#endif // QT_NO_LIBUDEV
     QStringList args = specification.split(QLatin1Char(':'));
     QStringList devices;
 
@@ -77,6 +81,7 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
     foreach (const QString &device, devices)
         addMouse(device);
 
+#ifndef QT_NO_LIBUDEV
     if (useUDev) {
 #ifdef QT_QPA_MOUSEMANAGER_DEBUG
         qWarning() << "Use UDev for device discovery";
@@ -94,6 +99,7 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
             connect(m_udeviceHelper, SIGNAL(deviceRemoved(QString,QUDeviceTypes)), this, SLOT(removeMouse(QString)));
         }
     }
+#endif // QT_NO_LIBUDEV
 }
 
 QEvdevMouseManager::~QEvdevMouseManager()
diff --git a/src/plugins/generic/evdevmouse/qevdevmousemanager.h b/src/plugins/generic/evdevmouse/qevdevmousemanager.h
index a42257b6a2..f51bd455e8 100644
--- a/src/plugins/generic/evdevmouse/qevdevmousemanager.h
+++ b/src/plugins/generic/evdevmouse/qevdevmousemanager.h
@@ -44,7 +44,9 @@
 
 #include "qevdevmousehandler.h"
 
+#ifndef QT_NO_LIBUDEV
 #include <QtPlatformSupport/private/qudevicehelper_p.h>
+#endif // QT_NO_LIBUDEV
 
 #include <QObject>
 #include <QHash>
@@ -68,7 +70,9 @@ private slots:
 private:
     QString m_spec;
     QHash<QString,QEvdevMouseHandler*> m_mice;
+#ifndef QT_NO_LIBUDEV
     QUDeviceHelper *m_udeviceHelper;
+#endif // QT_NO_LIBUDEV
 };
 
 QT_END_HEADER
-- 
cgit v1.2.3