Merge branch 'jb54456' into 'master'

[qtmozembed] Removal of unneeded QML mouse event handling. Fixes JB#54456 OMP#JOLLA-168 See merge request mer-core/qtmozembed!100
sailfishos · Jun 1, 2021 · 2cc99f6 · 2cc99f6
2 parents 0545b66 + 621f59b
commit 2cc99f6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 44 deletions.
diff --git a/src/qmozview_defined_wrapper.h b/src/qmozview_defined_wrapper.h
@@ -167,9 +167,6 @@ Q_DECLARE_METATYPE(QMozReturnValue) \
     void synthTouchEnd(const QVariant &touches); \
     void suspendView(); \
     void resumeView(); \
-    void recvMouseMove(int posX, int posY); \
-    void recvMousePress(int posX, int posY); \
-    void recvMouseRelease(int posX, int posY); \
 
 #define Q_MOZ_VIEW_SIGNALS \
     void viewInitialized(); \

diff --git a/src/qopenglwebpage.cpp b/src/qopenglwebpage.cpp
@@ -649,21 +649,6 @@ void QOpenGLWebPage::resumeView()
     d->mView->ResumeTimeouts();
 }
 
-void QOpenGLWebPage::recvMouseMove(int posX, int posY)
-{
-    d->recvMouseMove(posX, posY);
-}
-
-void QOpenGLWebPage::recvMousePress(int posX, int posY)
-{
-    d->recvMousePress(posX, posY);
-}
-
-void QOpenGLWebPage::recvMouseRelease(int posX, int posY)
-{
-    d->recvMouseRelease(posX, posY);
-}
-
 /*!
     \fn void QOpenGLWebPage::touchEvent(QTouchEvent *event)
 

diff --git a/src/quickmozview.cpp b/src/quickmozview.cpp
@@ -367,21 +367,21 @@ void QuickMozView::updateMargins()
 void QuickMozView::mouseMoveEvent(QMouseEvent *e)
 {
     const bool accepted = e->isAccepted();
-    recvMouseMove(e->pos().x(), e->pos().y());
+    d->recvMouseMove(e->pos().x(), e->pos().y());
     e->setAccepted(accepted);
 }
 
 void QuickMozView::mousePressEvent(QMouseEvent *e)
 {
     const bool accepted = e->isAccepted();
-    recvMousePress(e->pos().x(), e->pos().y());
+    d->recvMousePress(e->pos().x(), e->pos().y());
     e->setAccepted(accepted);
 }
 
 void QuickMozView::mouseReleaseEvent(QMouseEvent *e)
 {
     const bool accepted = e->isAccepted();
-    recvMouseRelease(e->pos().x(), e->pos().y());
+    d->recvMouseRelease(e->pos().x(), e->pos().y());
     e->setAccepted(accepted);
 }
 
@@ -833,21 +833,6 @@ void QuickMozView::resumeView()
     d->mView->ResumeTimeouts();
 }
 
-void QuickMozView::recvMouseMove(int posX, int posY)
-{
-    d->recvMouseMove(posX, posY);
-}
-
-void QuickMozView::recvMousePress(int posX, int posY)
-{
-    d->recvMousePress(posX, posY);
-}
-
-void QuickMozView::recvMouseRelease(int posX, int posY)
-{
-    d->recvMouseRelease(posX, posY);
-}
-
 void QuickMozView::touchEvent(QTouchEvent *event)
 {
     d->touchEvent(event);

diff --git a/tests/auto/desktop-qt5/linksactivation/tst_activatelinks.qml b/tests/auto/desktop-qt5/linksactivation/tst_activatelinks.qml
@@ -28,14 +28,6 @@ Item {
         }
     }
 
-    MouseArea {
-        id: viewportMouse
-        anchors.fill: parent
-        onPressed: webViewport.recvMousePress(mouseX, mouseY)
-        onReleased: webViewport.recvMouseRelease(mouseX, mouseY)
-        onPositionChanged: webViewport.recvMouseMove(mouseX, mouseY)
-    }
-
     TestCase {
         id: testcaseid
         name: "tst_activatelinks"