From f34faa3ee7e24c3d2dbe5116fc5d8fb61e53ac21 Mon Sep 17 00:00:00 2001 From: Vladyslav Stelmakhovskyi Date: Sun, 18 Jun 2017 10:54:59 +0200 Subject: [PATCH] Fix backward compatibility with Qt 5.6 --- interface/src/ui/overlays/Web3DOverlay.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp index f9745bdf2f..f9ec60c267 100644 --- a/interface/src/ui/overlays/Web3DOverlay.cpp +++ b/interface/src/ui/overlays/Web3DOverlay.cpp @@ -446,12 +446,21 @@ void Web3DOverlay::handlePointerEventAsTouch(const PointerEvent& event) { // // In Qt 5.9 mouse events must be sent before touch events to make sure some QtQuick components will // receive mouse events +#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) if (!(this->_pressed && event.getType() == PointerEvent::Move)) { QMouseEvent* mouseEvent = new QMouseEvent(mouseType, windowPoint, windowPoint, windowPoint, button, buttons, Qt::NoModifier); QCoreApplication::postEvent(_webSurface->getWindow(), mouseEvent); } - +#endif QCoreApplication::postEvent(_webSurface->getWindow(), touchEvent); + +#if QT_VERSION < QT_VERSION_CHECK(5, 9, 0) + if (this->_pressed && event.getType() == PointerEvent::Move) { + return; + } + QMouseEvent* mouseEvent = new QMouseEvent(mouseType, windowPoint, windowPoint, windowPoint, button, buttons, Qt::NoModifier); + QCoreApplication::postEvent(_webSurface->getWindow(), mouseEvent); +#endif } void Web3DOverlay::handlePointerEventAsMouse(const PointerEvent& event) {