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 /tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | |
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 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp')
-rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 19f9b6df1..dd1140a4f 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -1656,6 +1656,18 @@ void tst_QWebEnginePage::runJavaScript() JavaScriptCallbackUndefined callbackUndefined; page.runJavaScript("undefined", QWebEngineCallback<const QVariant&>(callbackUndefined)); + JavaScriptCallback callbackDate(QVariant(42.0)); + page.runJavaScript("new Date(42000)", QWebEngineCallback<const QVariant&>(callbackDate)); + + JavaScriptCallback callbackBlob(QVariant(QByteArray(8, 0))); + page.runJavaScript("new ArrayBuffer(8)", QWebEngineCallback<const QVariant&>(callbackBlob)); + + JavaScriptCallbackUndefined callbackFunction; + page.runJavaScript("(function(){})", QWebEngineCallback<const QVariant&>(callbackFunction)); + + JavaScriptCallback callbackPromise(QVariant(QVariantMap{})); + page.runJavaScript("new Promise(function(){})", QWebEngineCallback<const QVariant&>(callbackPromise)); + QVERIFY(watcher.wait()); } |