summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-08-06 14:58:33 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-08-06 17:49:30 +0200
commit83a6c1b92f38b4b0bdb3f90d67be7bb1e4caef7a (patch)
tree030b00c0810eae31e6506202c1a3d687928c779f /tests
parent8d914a161db9a4760594267285c48521b3af5481 (diff)
Move the runJavaScript function from experimental to public API
This is essential API that should be public. Change-Id: Ifbd86171933936112e2495ebed074faa2e52464d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/publicapi/tst_publicapi.cpp2
-rw-r--r--tests/auto/quick/qmltests/data/TestWebEngineView.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index ad54bd12..2f8644d4 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -105,6 +105,8 @@ static QStringList expectedAPI = QStringList()
<< "QQuickWebEngineView.iconChanged() --> void"
<< "QQuickWebEngineView.linkHovered(QUrl) --> void"
<< "QQuickWebEngineView.navigationRequested(QQuickWebEngineNavigationRequest*) --> void"
+ << "QQuickWebEngineView.runJavaScript(QString,QJSValue) --> void"
+ << "QQuickWebEngineView.runJavaScript(QString) --> void"
<< "QQuickWebEngineView.loadHtml(QString,QUrl) --> void"
<< "QQuickWebEngineView.loadHtml(QString) --> void"
<< "QQuickWebEngineView.goBack() --> void"
diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
index 5cbb2c89..dd05aea8 100644
--- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml
+++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
@@ -79,8 +79,6 @@ WebEngineView {
return predicate()
}
- function runJavaScript(script, callback) { experimental.runJavaScript(script, callback); }
-
TestResult { id: testResult }
onLoadingChanged: {