Fix warningsv5.11.0-beta4

"qwebglintegration.cpp", line 216: warning #68-D: integer conversion resulted
          in a change of sign
      WId winId = -1;
                  ^

"qwebglintegration.cpp", line 491: warning #1215-D: function
          "QWindowSystemInterface::handleMouseEvent(QWindow *, ulong, const)"
          QPointF &, const QPointF &, Qt::MouseButtons, Qt::KeyboardModifiers,
          Qt::MouseEventSource) [with]
          Delivery=QWindowSystemInterface::DefaultDelivery]" (declared at line
          85 of
          "/home/qt/work/install/include/QtGui/5.11.0/QtGui/qpa/qwindowsystemin
          ce.h") was declared deprecated"
      QWindowSystemInterface::handleMouseEvent(platformWindow->window(),
                              ^

"qwebglintegration.cpp", line 513: warning #1215-D: function
          "QWindowSystemInterface::handleWheelEvent(QWindow *, ulong, const
          QPointF &, const QPointF &, int, Qt::Orientation,
          Qt::KeyboardModifiers)" (declared at line 153 of
          "/home/qt/work/install/include/QtGui/5.11.0/QtGui/qpa/qwindowsystemin
          terface.h") was declared deprecated
      QWindowSystemInterface::handleWheelEvent(platformWindow->window(),
                              ^

Change-Id: I0b83cc38b6567f3819890c74e973bba52fe2acf8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/plugins/platforms/webgl/qwebglintegration.cpp b/src/plugins/platforms/webgl/qwebglintegration.cpp
index 679b389..59c2891 100644
--- a/src/plugins/platforms/webgl/qwebglintegration.cpp
+++ b/src/plugins/platforms/webgl/qwebglintegration.cpp
@@ -213,7 +213,7 @@ QPlatformWindow *QWebGLIntegration::createPlatformWindow(QWindow *window) const
 
     QWebGLWindow *platformWindow = nullptr;
     QWebSocket *socket = nullptr;
-    WId winId = -1;
+    auto winId = WId(-1);
     {
         QMutexLocker locker(&d->clients.mutex);
 
@@ -493,6 +493,8 @@ void QWebGLIntegrationPrivate::handleMouse(const ClientData &clientData, const Q
                                              localPos,
                                              globalPos,
                                              Qt::MouseButtons(buttons),
+                                             Qt::NoButton,
+                                             QEvent::None,
                                              Qt::NoModifier,
                                              Qt::MouseEventNotSynthesized);
 }
@@ -510,12 +512,15 @@ void QWebGLIntegrationPrivate::handleWheel(const ClientData &clientData, const Q
     const int deltaX = -object.value("deltaX").toInt(0);
     const int deltaY = -object.value("deltaY").toInt(0);
     auto orientation = deltaY != 0 ? Qt::Vertical : Qt::Horizontal;
+
+    QPoint point = (orientation == Qt::Vertical) ? QPoint(0, deltaY) : QPoint(deltaX, 0);
     QWindowSystemInterface::handleWheelEvent(platformWindow->window(),
                                              time,
                                              localPos,
                                              globalPos,
-                                             orientation == Qt::Vertical ? deltaY : deltaX,
-                                             orientation);
+                                             QPoint(),
+                                             point,
+                                             Qt::NoModifier);
 }
 
 void QWebGLIntegrationPrivate::handleTouch(const ClientData &clientData, const QJsonObject &object)