Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 8 insertions, 3 deletions

diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp
index 75e68b819..419052d8a 100644
--- a/src/input/frontend/qmousehandler.cpp
+++ b/src/input/frontend/qmousehandler.cpp
@@ -39,10 +39,11 @@
 
 #include "qmousehandler.h"
 #include "qmousehandler_p.h"
-#include "qmousedevice.h"
-#include "qmouseevent.h"
+
+#include <Qt3DInput/qmousedevice.h>
+#include <Qt3DInput/qmouseevent.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 QT_BEGIN_NAMESPACE
 
@@ -82,9 +83,11 @@ void QMouseHandlerPrivate::mouseEvent(const QMouseEventPtr &event)
         m_pressAndHoldTimer->stop();
         emit q->released(event.data());
         break;
+#if QT_CONFIG(gestures)
     case Qt::TapGesture:
         emit q->clicked(event.data());
         break;
+#endif
     case QEvent::MouseButtonDblClick:
         emit q->doubleClicked(event.data());
         break;
@@ -310,9 +313,11 @@ void QMouseHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
         if (e->propertyName() == QByteArrayLiteral("mouse")) {
             QMouseEventPtr ev = e->value().value<QMouseEventPtr>();
             d->mouseEvent(ev);
+#if QT_CONFIG(wheelevent)
         } else if (e->propertyName() == QByteArrayLiteral("wheel")) {
             QWheelEventPtr ev = e->value().value<QWheelEventPtr>();
             emit wheel(ev.data());
+#endif
         }
     }
 }