diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
commit | 7439343d169095a510d122ad7c69646a5946cdce (patch) | |
tree | 8540b2bac1e495533585a645e216eaab66b06bd2 /tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | |
parent | 3ecd61aea90cc4b283ffe9409cc10f5fd3476ecf (diff) | |
parent | f8c132ffb7cd32d52bbfe09caa811665a3cb1069 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginesettings.cpp
Change-Id: Ie4abadb076c51d070cbb05f29b9ebcd9705933ad
Diffstat (limited to 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp')
-rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index f7c0914bc..166c5a499 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -2823,6 +2823,9 @@ void tst_QWebEnginePage::testJSPrompt() { JSPromptPage page; bool res; + QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool))); + page.setHtml(QStringLiteral("<html><body></body></html>")); + QTRY_COMPARE(loadSpy.count(), 1); // OK + QString() res = evaluateJavaScriptSync(&page, |