diff options
author | Robin Burchell <robin+qt@viroteck.net> | 2012-06-22 15:12:38 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-24 05:26:39 +0200 |
commit | d153b73c12b5530782cd3eb526eaa9294a339abc (patch) | |
tree | 144f1d1d0443139148fcff038f899235e47e2c04 /src/plugins/platforms | |
parent | e6ccfe40eb1cd7c1a5b2c307093552bc39b4cf22 (diff) |
Guard evdev specifics with QT_NO_EVDEV.
Android fails the evdev configure test at present.
Change-Id: I1cbaf2dab589f647c02c8c5b92f72bd5159ccfa9
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/eglfs/qeglfsintegration.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp index f27f37acfa..b3f88e23a9 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp @@ -51,9 +51,11 @@ #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(); |