Guard evdev specifics with QT_NO_EVDEV.
authorRobin Burchell <robin+qt@viroteck.net>
Fri, 22 Jun 2012 13:12:38 +0000 (15:12 +0200)
committerQt by Nokia <qt-info@nokia.com>
Sun, 24 Jun 2012 03:26:39 +0000 (05:26 +0200)
Android fails the evdev configure test at present.

Change-Id: I1cbaf2dab589f647c02c8c5b92f72bd5159ccfa9
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
src/plugins/platforms/eglfs/qeglfsintegration.cpp

index f27f37a..b3f88e2 100644 (file)
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
 #include <QtPlatformSupport/private/qeglplatformcontext_p.h>
 
+#if !defined(QT_NO_EVDEV)
 #include <QtPlatformSupport/private/qevdevmousemanager_p.h>
 #include <QtPlatformSupport/private/qevdevkeyboardmanager_p.h>
 #include <QtPlatformSupport/private/qevdevtouch_p.h>
+#endif
 
 #include <qpa/qplatformwindow.h>
 #include <QtGui/QSurfaceFormat>
@@ -72,9 +74,11 @@ QEglFSIntegration::QEglFSIntegration()
 {
     QGuiApplicationPrivate::instance()->setEventDispatcher(mEventDispatcher);
 
+#if !defined(QT_NO_EVDEV)
     new QEvdevKeyboardManager(QLatin1String("EvdevKeyboard"), QString() /* spec */, this);
     new QEvdevMouseManager(QLatin1String("EvdevMouse"), QString() /* spec */, this);
     new QEvdevTouchScreenHandlerThread(QString() /* spec */, this);
+#endif
 
     hooks->platformInit();