From 4889bc3a575cafd68f99bd0b9c2a14b3ecf8c557 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 7 Feb 2018 18:37:14 +0100
Subject: [PATCH] Remove usage of private call
QWidgetPrivate::updateWidgetTransform()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It used to be needed in 5.6 for IME window placement purposes, but
since 5.7 when we switched to using QQuickWidget instead of
QOpenGLWidget as a result of commit
800365f6faad962a4dd2e71173527d285a3f62b5, the updateWidgetTransform
gets called implicitly because we forward FocusIn events to
QQuickWidget::event, which forwards them to QWidget::event which
calls updateWidgetTransform for us.
Task-number: QTBUG-63098
Change-Id: I0a0ba50c1491797b37765d26d761c358c156950f
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
.../render_widget_host_view_qt_delegate_widget.cpp | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 8dd5c158b..9e2f6ed99 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -51,8 +51,6 @@
#include <QWindow>
#include <private/qquickwindow_p.h>
-#include <private/qwidget_p.h>
-
namespace QtWebEngineCore {
class RenderWidgetHostViewQuickItem : public QQuickItem {
@@ -462,12 +460,6 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
break;
}
- QEvent::Type type = event->type();
- if (type == QEvent::FocusIn) {
- QWidgetPrivate *d = QWidgetPrivate::get(this);
- d->updateWidgetTransform(event);
- }
-
if (event->type() == QEvent::MouseButtonDblClick) {
// QWidget keeps the Qt4 behavior where the DblClick event would replace the Press event.
// QtQuick is different by sending both the Press and DblClick events for the second press
--
GitLab