diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-23 10:36:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 10:42:53 +0200 |
| commit | b7a905a4f2f43b856e5f365439fb21b70a03682e (patch) | |
| tree | 0712f43bbeec8c03e739110ddfa584943bf6fdac /src/webenginewidgets/doc | |
| parent | e710d15b7243f2fbc99f98c3ca79d325eb459ac7 (diff) | |
| parent | e02bcb0855ebee0612cab0f3cd3f9fd494497336 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty
src/core/net/network_delegate_qt.cpp
tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
Change-Id: Ib715b3047213583e0441b915d3cabb801d9d4ba8
Diffstat (limited to 'src/webenginewidgets/doc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 6e33f8692..e63423be8 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -772,6 +772,11 @@ page.runJavaScript("document.title", [](const QVariant &v) { qDebug() << v.toString(); }); \endcode + Only "plain data" can be returned from JavaScript as the result value. + Supported data types include all of the JSON data types as well as, for + example, \c{Date} and \c{ArrayBuffer}. Unsupported data types include, for + example, \c{Function} and \c{Promise}. + \warning Do not execute lengthy routines in the callback function, because it might block the rendering of the web engine page. |