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

Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
and comboBoxPopupPositionAfterMove().

Conflicts:
	.qmake.conf
	src/3rdparty
	src/core/render_widget_host_view_qt.cpp
	src/core/resources/resources.gyp
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
	tests/auto/widgets/qwebenginepage/BLACKLIST
	tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
	tools/qmake/mkspecs/features/functions.prf

Task-number: QTBUG-55158
Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4

1 files changed, 20 insertions, 2 deletions

diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
index b93c538d8..246ab2c0c 100644
--- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
@@ -422,13 +422,31 @@ void BrowserMainWindow::setupMenu()
 
     m_historyBack = new QAction(tr("Back"), this);
     m_tabWidget->addWebAction(m_historyBack, QWebEnginePage::Back);
-    m_historyBack->setShortcuts(QKeySequence::Back);
+    QList<QKeySequence> backShortcuts = QKeySequence::keyBindings(QKeySequence::Back);
+    for (auto it = backShortcuts.begin(); it != backShortcuts.end();) {
+        // Chromium already handles navigate on backspace when appropriate.
+        if ((*it)[0] == Qt::Key_Backspace)
+            it = backShortcuts.erase(it);
+        else
+            ++it;
+    }
+    // For some reason Qt doesn't bind the dedicated Back key to Back.
+    backShortcuts.append(QKeySequence(Qt::Key_Back));
+    m_historyBack->setShortcuts(backShortcuts);
     m_historyBack->setIconVisibleInMenu(false);
     historyActions.append(m_historyBack);
 
     m_historyForward = new QAction(tr("Forward"), this);
     m_tabWidget->addWebAction(m_historyForward, QWebEnginePage::Forward);
-    m_historyForward->setShortcuts(QKeySequence::Forward);
+    QList<QKeySequence> fwdShortcuts = QKeySequence::keyBindings(QKeySequence::Forward);
+    for (auto it = fwdShortcuts.begin(); it != fwdShortcuts.end();) {
+        if (((*it)[0] & Qt::Key_unknown) == Qt::Key_Backspace)
+            it = fwdShortcuts.erase(it);
+        else
+            ++it;
+    }
+    fwdShortcuts.append(QKeySequence(Qt::Key_Forward));
+    m_historyForward->setShortcuts(fwdShortcuts);
     m_historyForward->setIconVisibleInMenu(false);
     historyActions.append(m_historyForward);