summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineview.cpp
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2015-03-10 07:18:31 -0700
committerSzabolcs David <davidsz@inf.u-szeged.hu>2015-03-11 15:57:51 +0000
commitd3905d85925a950ca32aa78eead6db7228be1330 (patch)
tree19c09ceafa14c87bf335b52992d98a90b3fbaddf /src/webengine/api/qquickwebengineview.cpp
parent769b3a61f5d2abcb3f694ade95e1e8f1c505b75a (diff)
Add tst_javaScriptDialogs QML testv5.5.0-alpha1
Test alert, confirm and prompt dialogs via test support API. Change-Id: I9057a887491ac68e86ccd87181d4091323f6ee6f Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r--src/webengine/api/qquickwebengineview.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index f10ddbb02..4bc6cd087 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -229,6 +229,12 @@ void QQuickWebEngineViewPrivate::navigationRequested(int navigationType, const Q
void QQuickWebEngineViewPrivate::javascriptDialog(QSharedPointer<JavaScriptDialogController> dialog)
{
+#ifdef ENABLE_QML_TESTSUPPORT_API
+ if (m_testSupport) {
+ m_testSupport->testDialog(dialog);
+ return;
+ }
+#endif
ui()->showDialog(dialog);
}