From 54727da4906e689ff95a7c6804f4135f9673a461 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 3 Nov 2017 12:33:22 +0100 Subject: Doc: Rewrite AllowWindowActivationFromJavaScript docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1486542b2981e5ff16c9eed92c513b9ef7cdd795 Reviewed-by: Michael Brüning --- src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/webenginewidgets/doc') diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index d3b16a935..3fe87082a 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -163,7 +163,8 @@ origins to access Geolocation again. Disabled by default. (Added in Qt 5.9) \value AllowWindowActivationFromJavaScript - Allows the window.focus() method in JavaScript. Disallowed by default. + Allows activating windows by using the window.focus() JavaScript + method. Disabled by default. (Added in Qt 5.10) \value ShowScrollBars Shows scroll bars. -- cgit v1.2.3 From f9eb2b95fcdb4df82d3ba8c4aab44347a2bad452 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 20 Nov 2017 11:06:33 +0100 Subject: Add detailed documentation for when selectionChanged() gets emitted Task-number: QTBUG-51096 Change-Id: Id1029577418884d5aa14296a53a8223ec410a4a2 Reviewed-by: Leena Miettinen --- src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 3 +++ src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc | 3 +++ 2 files changed, 6 insertions(+) (limited to 'src/webenginewidgets/doc') diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 5248a383a..4cad5a063 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -550,6 +550,9 @@ This signal is emitted whenever the selection changes, either interactively or programmatically. For example, by calling triggerAction() with a selection action. + \note When using the mouse to select text by left-clicking and dragging, the signal will be + emitted for each new character selected, and not upon releasing the left mouse button. + \sa selectedText() */ diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc index 34a61ded3..27ee96c5e 100644 --- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc @@ -366,6 +366,9 @@ This signal is emitted whenever the selection changes. + \note When using the mouse to select text by left-clicking and dragging, the signal will be + emitted for each new character selected, and not upon releasing the left mouse button. + \sa selectedText() */ -- cgit v1.2.3