diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2014-03-01 14:13:08 +0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-10 18:19:10 +0100 |
| commit | 735d376937feaa6e4d2140aeeca6ffb3a308a5b9 (patch) | |
| tree | a518a0105011c46ede1edb0aa87e5b04787c5b62 /Source/WebKit/qt/WidgetApi/qwebpage.cpp | |
| parent | 429b2c361376ebe23458c1258203b8f9c0bab47d (diff) | |
| download | qtwebkit-735d376937feaa6e4d2140aeeca6ffb3a308a5b9.tar.gz | |
When checking if relative URL is local, take baseUrl into account
Links with empty schemes (href="file.html") or anchored links
(href="#someid") should now be treated as local links if base
url is local.
See <https://bugs.webkit.org/show_bug.cgi?id=94360>.
Change-Id: I31e254ad7341bd54965c91d2e9dd2fbff7a99776
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit/qt/WidgetApi/qwebpage.cpp')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index 05caf7134..e19d7bc79 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -2150,6 +2150,9 @@ bool QWebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest & return true; case DelegateExternalLinks: + if (request.url().scheme().isEmpty() && + QWebPageAdapter::treatSchemeAsLocal(frame->baseUrl().scheme())) + return true; if (QWebPageAdapter::treatSchemeAsLocal(request.url().scheme())) return true; emit linkClicked(request.url()); |