diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-25 10:47:45 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-25 10:47:45 +0100 |
| commit | 5ca2d76b78df1839b92b04d7d6e7710f5d402c98 (patch) | |
| tree | 69cd30c70fff2cb66ff498f5a120d822ccc2eaac /src/core/web_contents_delegate_qt.cpp | |
| parent | ecfb3ba8a7eb116c838a1acd5b82ca59ce76b082 (diff) | |
| parent | 6766290699acd0d73c81cf690012d52729e518b9 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
Change-Id: Ib9c9eca457c1c42dab948e6cb56d44b57d5da32a
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 36acfe62e..0f7808e51 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -422,7 +422,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) { |