Merge branch 'Falkon/3.0'

src/lib/webengine/webview.cpp

@@ -1243,6 +1243,17 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     });
 }
 
+bool WebView::focusNextPrevChild(bool next)
+{
+    // QTBUG-67043
+    // Workaround QtWebEngine issue where QWebEngineView loses focus on second load() call.
+    if (next) {
+        setFocus();
+        return false;
+    }
+    return QWebEngineView::focusNextPrevChild(next);
+}
+
 void WebView::loadRequest(const LoadRequest &req)
 {
     QWebEngineView::load(req.webRequest());

src/lib/webengine/webview.h

@@ -145,6 +145,8 @@ protected:
     void resizeEvent(QResizeEvent *event) override;
     void contextMenuEvent(QContextMenuEvent *event) override;
 
+    bool focusNextPrevChild(bool next) override;
+
     virtual void _wheelEvent(QWheelEvent *event);
     virtual void _mousePressEvent(QMouseEvent *event);
     virtual void _mouseReleaseEvent(QMouseEvent *event);