Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev

8 files changed, 22 insertions, 19 deletions

diff --git a/src/webengine/api/qquickwebengineaction.cpp b/src/webengine/api/qquickwebengineaction.cpp
index 16eef04d3..69a05f29b 100644
--- a/src/webengine/api/qquickwebengineaction.cpp
+++ b/src/webengine/api/qquickwebengineaction.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule QtWebEngine
     \since QtWebEngine 1.8
 
-    \brief An action that represents a \l WebEngineView::WebAction
+    \brief An action that represents a \l WebEngineView::WebAction.
 
     A WebEngineAction is returned by the \l WebEngineView::action()
     method. It provides information about the action, such as
@@ -146,7 +146,8 @@ QString QQuickWebEngineAction::iconName() const
 /*!
     \qmlproperty bool WebEngineAction::enabled
 
-    This property holds whether the action is enabled.
+    This property holds whether the action is enabled. Context-dependent
+    actions are always enabled.
 */
 bool QQuickWebEngineAction::isEnabled() const
 {
diff --git a/src/webengine/api/qquickwebengineaction_p_p.h b/src/webengine/api/qquickwebengineaction_p_p.h
index 4320f73e4..d2ead30e9 100644
--- a/src/webengine/api/qquickwebengineaction_p_p.h
+++ b/src/webengine/api/qquickwebengineaction_p_p.h
@@ -72,13 +72,13 @@ public:
 
     void trigger();
 
-private:
-    QQuickWebEngineAction *q_ptr;
-
     QVariant m_data;
     QString m_text;
     QString m_iconName;
     bool m_enabled;
+
+private:
+    QQuickWebEngineAction *q_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index 237334b67..1d93c5070 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -53,6 +53,8 @@
 #include "renderer_host/user_resource_controller_host.h"
 #include "web_engine_settings.h"
 
+#include <QtWebEngineCore/qwebengineurlscheme.h>
+
 using QtWebEngineCore::ProfileAdapter;
 
 QT_BEGIN_NAMESPACE
@@ -905,7 +907,7 @@ const QWebEngineUrlSchemeHandler *QQuickWebEngineProfile::urlSchemeHandler(const
 /*!
     Registers a handler \a handler for custom URL scheme \a scheme in the profile.
 
-    It is recommended to first register the scheme with \l
+    It is necessary to first register the scheme with \l
     QWebEngineUrlScheme::registerScheme at application startup.
 */
 void QQuickWebEngineProfile::installUrlSchemeHandler(const QByteArray &scheme, QWebEngineUrlSchemeHandler *handler)
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index e2a8b562d..3659f35fa 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -2225,7 +2225,8 @@ void QQuickContextMenuBuilder::addMenuItem(ContextMenuItem menuItem)
         m_view->d_ptr->ui()->addMenuSeparator(m_menu);
         return;
     }
-    action->d_ptr->setEnabled(isMenuItemEnabled(menuItem));
+    // Set enabled property directly with avoiding binding loops caused by its notifier signal.
+    action->d_ptr->m_enabled = isMenuItemEnabled(menuItem);
     m_view->d_ptr->ui()->addMenuItem(action, m_menu);
 }
 
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index 59429ec5a..0b2aebfce 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -41,7 +41,7 @@
     \list
         \li \l{Qt for Windows - Requirements}
         \li \l{Qt for X11 Requirements}
-        \li \l{Qt for macOS - Requirements}
+        \li \l{Qt for macOS - Building from Source}
     \endlist
 
     In addition, the following tools are required for building the \l {Qt WebEngine} module:
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc
index 87094c266..0e25e16f3 100644
--- a/src/webengine/doc/src/webengineview_lgpl.qdoc
+++ b/src/webengine/doc/src/webengineview_lgpl.qdoc
@@ -754,9 +754,11 @@
     \value  WebEngineView.OpenLinkInThisWindow
             Open the current link in the current window. (Added in Qt 5.6)
     \value  WebEngineView.OpenLinkInNewWindow
-            Open the current link in a new window. (Added in Qt 5.6)
+            Open the current link in a new window. Requires a handler for the
+            \l newViewRequested() signal. (Added in Qt 5.6)
     \value  WebEngineView.OpenLinkInNewTab
-            Open the current link in a new tab. (Added in Qt 5.6)
+            Open the current link in a new tab. Requires a handler for the
+            \l newViewRequested() signal. (Added in Qt 5.6)
     \value  WebEngineView.CopyLinkToClipboard
             Copy the current link to the clipboard. (Added in Qt 5.6)
     \value  WebEngineView.CopyImageToClipboard
@@ -777,8 +779,8 @@
             Mute or unmute the hovered audio or video element. (Added in Qt 5.6)
     \value  WebEngineView.DownloadLinkToDisk
             Download the current link to the disk. To implement download
-            actions, connect to the QWebEngineProfile::downloadRequested signal.
-            (Added in Qt 5.6)
+            actions, connect to the \l {QQuickWebEngineProfile::downloadRequested}
+            {WebEngineProfile.downloadRequested} signal. (Added in Qt 5.6)
     \value  WebEngineView.DownloadImageToDisk
             Download the highlighted image to the disk. (Added in Qt 5.6)
     \value  WebEngineView.DownloadMediaToDisk
@@ -791,7 +793,8 @@
     \value  WebEngineView.SavePage
             Save the current web page to disk. (Added in Qt 5.7)
     \value  WebEngineView.ViewSource
-            Show the source of the current page in a new tab. (Added in Qt 5.8)
+            Show the source of the current page in a new tab. Requires a handler for the
+            \l newViewRequested() signal. (Added in Qt 5.8)
 
     \value  WebEngineView.ToggleBold
             Toggles boldness for the selection or at the cursor position.
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 1176573fd..2f65db97a 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -54,7 +54,6 @@ namespace QtWebEngineCore {
 RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQtDelegateClient *client, bool isPopup)
     : m_client(client)
     , m_isPopup(isPopup)
-    , m_isPasswordInput(false)
 {
     setFlag(ItemHasContents);
     setAcceptedMouseButtons(Qt::AllButtons);
@@ -206,11 +205,9 @@ void RenderWidgetHostViewQtDelegateQuick::inputMethodStateChanged(bool editorVis
     if (parentItem())
         parentItem()->setFlag(QQuickItem::ItemAcceptsInputMethod, editorVisible && !passwordInput);
 
-    if (qApp->inputMethod()->isVisible() != editorVisible || m_isPasswordInput != passwordInput) {
-        qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled | Qt::ImHints);
+    qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled | Qt::ImHints);
+    if (qApp->inputMethod()->isVisible() != editorVisible)
         qApp->inputMethod()->setVisible(editorVisible);
-        m_isPasswordInput = passwordInput;
-    }
 }
 
 bool RenderWidgetHostViewQtDelegateQuick::event(QEvent *event)
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 6f6cd1509..d4d64804a 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -113,7 +113,6 @@ private:
     RenderWidgetHostViewQtDelegateClient *m_client;
     QList<QMetaObject::Connection> m_windowConnections;
     bool m_isPopup;
-    bool m_isPasswordInput;
     QPointF m_lastGlobalPos;
     QQuickWebEngineView *m_view = nullptr;
 };