diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-24 10:34:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-24 10:34:04 +0100 |
| commit | da4d5bd985454fe2dc5fbe44c92b81a94b525088 (patch) | |
| tree | 34819bb7b5c9a3f721c567f3f664bfe4d6048f2e /src/core/web_contents_delegate_qt.cpp | |
| parent | b44962c8bce5489deee289212282cdf2c89b425a (diff) | |
| parent | 95a22234a4671e6e79ce1cecbd720551a185d278 (diff) | |
Merge branch '5.6' into 5.7
Conflicts:
src/core/api/qwebengineurlrequestinfo.cpp
src/core/api/qwebengineurlrequestinfo.h
src/core/core_gyp_generator.pro
Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 757ae853c..cf2121390 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -421,7 +421,7 @@ void WebContentsDelegateQt::requestGeolocationPermission(const QUrl &requestingO m_viewClient->runGeolocationPermissionRequest(requestingOrigin); } -extern int pageTransitionToNavigationType(ui::PageTransition transition); +extern WebContentsAdapterClient::NavigationType pageTransitionToNavigationType(ui::PageTransition transition); void WebContentsDelegateQt::launchExternalURL(const QUrl &url, ui::PageTransition page_transition, bool is_main_frame) { |