Skip to content
Snippets Groups Projects
Commit 30d1f3b0 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'qt-5.9-support' into paraview/release


7c3353e8 QQuickVTKInteractorAdapter: support Qt 5.9

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarbuildbot <buildbot@kitware.com>
Reviewed-by: default avatarMathieu Westphal <mathieu.westphal@kitware.com>
Merge-request: !9972
parents 7f9aac5d 7c3353e8
No related branches found
No related tags found
No related merge requests found
......@@ -105,9 +105,16 @@ void QQuickVTKInteractorAdapter::QueueWheelEvent(QQuickItem* item, QWheelEvent*
p = e->posF();
gp = e->globalPosF();
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
QWheelEvent* newEvent = new QWheelEvent(this->mapEventPosition(item, p),
this->mapEventPosition(item, gp), e->pixelDelta(), e->angleDelta(), e->buttons(),
e->modifiers(), e->phase(), e->inverted(), e->source());
#else
QWheelEvent* newEvent = new QWheelEvent(this->mapEventPosition(item, p),
this->mapEventPosition(item, gp), e->pixelDelta(), e->angleDelta(), //
0, Qt::Horizontal, // Qt4 compatibility arguments
e->buttons(), e->modifiers(), e->phase(), e->source(), e->inverted());
#endif
QueueEvent(newEvent);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment