1 files changed, 5 insertions, 23 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 5d8c4fa43..e9abec02e 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -48,12 +48,6 @@
 #include <QVariant>
 #include <QWindow>
 #include <private/qquickwindow_p.h>
-#include <private/qsgcontext_p.h>
-
-#if (QT_VERSION < QT_VERSION_CHECK(5, 8, 0))
-#include <QSGSimpleRectNode>
-#include <QSGSimpleTextureNode>
-#endif
 
 namespace QtWebEngineCore {
 
@@ -185,30 +179,17 @@ QSGLayer *RenderWidgetHostViewQtDelegateQuick::createLayer()
 QSGInternalImageNode *RenderWidgetHostViewQtDelegateQuick::createImageNode()
 {
     QSGRenderContext *renderContext = QQuickWindowPrivate::get(QQuickItem::window())->context;
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
     return renderContext->sceneGraphContext()->createInternalImageNode();
-#else
-    return renderContext->sceneGraphContext()->createImageNode();
-#endif
 }
 
 QSGTextureNode *RenderWidgetHostViewQtDelegateQuick::createTextureNode()
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
     return QQuickItem::window()->createImageNode();
-#else
-    return new QSGSimpleTextureNode();
-#endif
 }
 
 QSGRectangleNode *RenderWidgetHostViewQtDelegateQuick::createRectangleNode()
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
     return QQuickItem::window()->createRectangleNode();
-#else
-    QSGRenderContext *renderContext = QQuickWindowPrivate::get(QQuickItem::window())->context;
-    return renderContext->sceneGraphContext()->createRectangleNode();
-#endif
 }
 
 void RenderWidgetHostViewQtDelegateQuick::update()
@@ -228,14 +209,15 @@ void RenderWidgetHostViewQtDelegateQuick::resize(int width, int height)
 
 void RenderWidgetHostViewQtDelegateQuick::inputMethodStateChanged(bool editorVisible)
 {
-    if (qApp->inputMethod()->isVisible() == editorVisible)
-        return;
+    setFlag(QQuickItem::ItemAcceptsInputMethod, editorVisible);
 
-    if (parentItem() && parentItem()->flags() & QQuickItem::ItemAcceptsInputMethod) {
+    if (parentItem())
+        parentItem()->setFlag(QQuickItem::ItemAcceptsInputMethod, editorVisible);
+
+    if (qApp->inputMethod()->isVisible() != editorVisible) {
         qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled | Qt::ImHints);
         qApp->inputMethod()->setVisible(editorVisible);
     }
-
 }
 
 bool RenderWidgetHostViewQtDelegateQuick::event(QEvent *event)