diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-03-22 19:23:42 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-03-22 19:26:27 +0100 |
| commit | dac590ce0d0b40af8332209c402639a5e14e4b6b (patch) | |
| tree | 48d49e6693d35e3a801f381b451620645ebb5f6c /src/webengine/api/qquickwebengineview.cpp | |
| parent | d51d9b81da1c6c0989b2d5d68d09ede70144abd5 (diff) | |
| parent | 6e8fdb129b7ffa19eacb3ef5d03989e52a6a0169 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Icc27b58763c9aeac9f940fa17d3381fe1f4659ac
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index b14c9b9af..5c3ca2634 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -230,12 +230,6 @@ 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); } |