diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-16 21:05:28 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-07-16 21:05:28 +0000 |
| commit | 42750a9325bc349eae6a6ccdd022a941e1cdf88c (patch) | |
| tree | b2d2561fee273ec096b9336d2e91e65176a98233 /src | |
| parent | 6c6173b3b1436e54b22b226e7973d4936db2bfe8 (diff) | |
| parent | a39a36d115629eb1190d4281d4032db557ff6ff0 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/config/common.pri | 9 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index c39c1f1c0..b0723e333 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -46,8 +46,13 @@ use?(webrtc) { use?(proprietary_codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\" CONFIG(release, debug|release) { - force_debug_info: gn_args += symbol_level=1 - else: gn_args += symbol_level=0 + force_debug_info { + # Level 1 is not enough to generate all Chromium debug symbols on Windows + msvc: gn_args += symbol_level=2 + else: gn_args += symbol_level=1 + } else { + gn_args += symbol_level=0 + } } !webcore_debug: gn_args += remove_webcore_debug_symbols=true diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 1fceb4366..c5c772411 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -358,6 +358,8 @@ void QQuickWebEngineViewPrivate::navigationRequested(int navigationType, const Q Q_EMIT q->navigationRequested(&navigationRequest); navigationRequestAction = navigationRequest.action(); + if ((navigationRequestAction == WebContentsAdapterClient::AcceptRequest) && adapter) + adapter->stopFinding(); } void QQuickWebEngineViewPrivate::javascriptDialog(QSharedPointer<JavaScriptDialogController> dialog) diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index d0305f81a..87af187e3 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1505,6 +1505,8 @@ void QWebEnginePagePrivate::navigationRequested(int navigationType, const QUrl & { Q_Q(QWebEnginePage); bool accepted = q->acceptNavigationRequest(url, static_cast<QWebEnginePage::NavigationType>(navigationType), isMainFrame); + if (accepted && adapter) + adapter->stopFinding(); navigationRequestAction = accepted ? WebContentsAdapterClient::AcceptRequest : WebContentsAdapterClient::IgnoreRequest; } |