Merge branch '5.12' into dev

Conflicts:
    src/core/compositor/compositor.cpp
    src/core/compositor/compositor.h

Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e

7 files changed, 41 insertions, 10 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 3bc0be196..d9667a643 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -1844,6 +1844,7 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action)
         break;
     case Stop:
         text = tr("Stop");
+        iconName = QStringLiteral("process-stop");
         break;
     case Reload:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Reload);
@@ -1851,28 +1852,35 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action)
         break;
     case ReloadAndBypassCache:
         text = tr("Reload and Bypass Cache");
+        iconName = QStringLiteral("view-refresh");
         break;
     case Cut:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Cut);
-        iconName = QStringLiteral("Cut");
+        iconName = QStringLiteral("edit-cut");
         break;
     case Copy:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Copy);
+        iconName = QStringLiteral("edit-copy");
         break;
     case Paste:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Paste);
+        iconName = QStringLiteral("edit-paste");
         break;
     case Undo:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Undo);
+        iconName = QStringLiteral("edit-undo");
         break;
     case Redo:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Redo);
+        iconName = QStringLiteral("edit-redo");
         break;
     case SelectAll:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::SelectAll);
+        iconName = QStringLiteral("edit-select-all");
         break;
     case PasteAndMatchStyle:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::PasteAndMatchStyle);
+        iconName = QStringLiteral("edit-paste");
         break;
     case OpenLinkInThisWindow:
         text = tr("Open link in this window");
@@ -1909,9 +1917,11 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action)
         break;
     case ToggleMediaPlayPause:
         text = tr("Toggle Play/Pause");
+        iconName = QStringLiteral("media-playback-start");
         break;
     case ToggleMediaMute:
         text = tr("Toggle Mute");
+        iconName = QStringLiteral("audio-volume-muted");
         break;
     case DownloadMediaToDisk:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::DownloadMediaToDisk);
@@ -1921,31 +1931,38 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action)
         break;
     case ExitFullScreen:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::ExitFullScreen);
+        iconName = QStringLiteral("view-fullscreen");
         break;
     case RequestClose:
         text = tr("Close Page");
+        iconName = QStringLiteral("window-close");
         break;
     case Unselect:
         text = tr("Unselect");
+        iconName = QStringLiteral("edit-select-none");
         break;
     case SavePage:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::SavePage);
+        iconName = QStringLiteral("document-save");
         break;
     case ViewSource:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::ViewSource);
-        iconName = QStringLiteral("view-source");
         break;
     case ToggleBold:
         text = tr("&Bold");
+        iconName = QStringLiteral("format-text-bold");
         break;
     case ToggleItalic:
         text = tr("&Italic");
+        iconName = QStringLiteral("format-text-italic");
         break;
     case ToggleUnderline:
         text = tr("&Underline");
+        iconName = QStringLiteral("format-text-underline");
         break;
     case ToggleStrikethrough:
         text = tr("&Strikethrough");
+        iconName = QStringLiteral("format-text-strikethrough");
         break;
     case AlignLeft:
         text = tr("Align &Left");
@@ -1961,9 +1978,11 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action)
         break;
     case Indent:
         text = tr("&Indent");
+        iconName = QStringLiteral("format-indent-more");
         break;
     case Outdent:
         text = tr("&Outdent");
+        iconName = QStringLiteral("format-indent-less");
         break;
     case InsertOrderedList:
         text = tr("Insert &Ordered List");
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index 9c2cbb414..bd5569e3f 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -89,7 +89,7 @@
     \l{https://chromium.googlesource.com/chromium/src/+/master/docs/chromium_browser_vs_google_chrome.md}{overview}
     that is part of the documentation in the \l {Chromium Project} upstream source tree.
 
-    This version of Qt WebEngine is based on Chromium version 65.0.3325.151, with
+    This version of Qt WebEngine is based on Chromium version 69.0.3497.128, with
     additional security fixes from newer versions.
 
     \section2 Qt WebEngine Process
diff --git a/src/webengine/plugin/qmldir b/src/webengine/plugin/qmldir
index e24f55ed9..8970dc9c1 100644
--- a/src/webengine/plugin/qmldir
+++ b/src/webengine/plugin/qmldir
@@ -1,3 +1,4 @@
 module QtWebEngine
 plugin qtwebengineplugin
+classname QtWebEnginePlugin
 typeinfo plugins.qmltypes
diff --git a/src/webengine/plugin/testsupport/qmldir b/src/webengine/plugin/testsupport/qmldir
index 588c9d2d4..7fff80251 100644
--- a/src/webengine/plugin/testsupport/qmldir
+++ b/src/webengine/plugin/testsupport/qmldir
@@ -1,3 +1,4 @@
 module QtWebEngine.testsupport
 plugin qtwebenginetestsupportplugin
+classname QtWebEngineTestSupportPlugin
 typeinfo plugins.qmltypes
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 d23e64774..1176573fd 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -327,8 +327,7 @@ void RenderWidgetHostViewQtDelegateQuick::geometryChanged(const QRectF &newGeome
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
 
     if (window()) {
-        // TODO(pvarga): Use QQuickItem::mapToGlobal from Qt 5.7
-        const QPoint globalPos = window()->mapToGlobal(position().toPoint());
+        const QPointF globalPos = QQuickItem::mapToGlobal(position());
         if (globalPos != m_lastGlobalPos) {
             m_lastGlobalPos = globalPos;
             m_client->windowBoundsChanged();
@@ -366,10 +365,8 @@ QSGNode *RenderWidgetHostViewQtDelegateQuick::updatePaintNode(QSGNode *oldNode,
 
 void RenderWidgetHostViewQtDelegateQuick::onWindowPosChanged()
 {
-    if (window()) {
-        // TODO(pvarga): Use QQuickItem::mapToGlobal from Qt 5.7
-        m_lastGlobalPos = window()->mapToGlobal(position().toPoint());
-    }
+    if (window())
+        m_lastGlobalPos = QQuickItem::mapToGlobal(position());
     m_client->windowBoundsChanged();
 }
 
@@ -379,4 +376,15 @@ void RenderWidgetHostViewQtDelegateQuick::onHide()
     m_client->forwardEvent(&event);
 }
 
+bool RenderWidgetHostViewQtDelegateQuick::copySurface(const QRect &rect, const QSize &size, QImage &image)
+{
+    image = QQuickItem::window()->grabWindow();
+    if (image.isNull())
+        return false;
+    QRect subrect = !rect.isEmpty() ? rect : image.rect();
+    image = image.copy(subrect);
+    image = image.scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    return true;
+}
+
 } // namespace QtWebEngineCore
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
index 6b855c824..6f6cd1509 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -82,6 +82,7 @@ public:
     void setInputMethodHints(Qt::InputMethodHints) override { }
     // The QtQuick view doesn't have a backbuffer of its own and doesn't need this
     void setClearColor(const QColor &) override { }
+    bool copySurface(const QRect &rect, const QSize &size, QImage &image) override;
 
 protected:
     bool event(QEvent *event) override;
@@ -113,7 +114,7 @@ private:
     QList<QMetaObject::Connection> m_windowConnections;
     bool m_isPopup;
     bool m_isPasswordInput;
-    QPoint m_lastGlobalPos;
+    QPointF m_lastGlobalPos;
     QQuickWebEngineView *m_view = nullptr;
 };
 
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
index df241bf3a..36e4ddd8a 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
@@ -78,6 +78,7 @@ public:
     void inputMethodStateChanged(bool, bool) override {}
     void setInputMethodHints(Qt::InputMethodHints) override { }
     void setClearColor(const QColor &) override { }
+    bool copySurface(const QRect &, const QSize &, QImage &) override { return false; }
 
 private:
     QScopedPointer<RenderWidgetHostViewQtDelegate> m_realDelegate;