diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-16 13:46:56 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-23 17:23:26 +0000 |
| commit | 95a22234a4671e6e79ce1cecbd720551a185d278 (patch) | |
| tree | f875acf462e7ae8085b4edf941f812a9943178b9 /src/core/web_contents_delegate_qt.cpp | |
| parent | 95435bbef3102727759e826bed63fe3d0a6ce057 (diff) | |
ResourceType ABI/API fixup
[ChangeLog][Important Changes] The enum value ResourceTypeUnknown has changed
value since there was a mismatch between 5.6 and 5.7+ definitions. In general
any unknown ResourceType value should handled as unknown for forward
compatibility, since more types are and can be added in later Qt versions.
Change-Id: I0a9f8a2129d4549deeae01e199f432fbbf1bbb9e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
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 5e9157069..95a66f622 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -393,7 +393,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) { |