Merge remote-tracking branch 'origin/5.15' into dev

Including update to 87-based

Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6

1 files changed, 5 insertions, 6 deletions

diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 7956bec54..6eb5adec2 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -75,14 +75,13 @@ RenderWidgetHostViewQtDelegateQuick::~RenderWidgetHostViewQtDelegateQuick()
     QQuickWebEngineViewPrivate::bindViewAndWidget(nullptr, this);
 }
 
-void RenderWidgetHostViewQtDelegateQuick::initAsPopup(const QRect &r)
+void RenderWidgetHostViewQtDelegateQuick::initAsPopup(const QRect &screenRect)
 {
+    //note this is called when there is no windowing system
+    //otherwsie see RenderWidgetHostViewQtDelegateQuickWindow
     Q_ASSERT(m_isPopup && parentItem());
-    QRectF rect(parentItem()->mapRectFromScene(r));
-    setX(rect.x());
-    setY(rect.y());
-    setWidth(rect.width());
-    setHeight(rect.height());
+    setPosition(screenRect.topLeft());
+    setSize(screenRect.size());
     setVisible(true);
 }