diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-02-22 16:11:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-02-22 16:11:09 +0000 |
| commit | 50f20864b536982ea9aafa1851a2e647144ed6ac (patch) | |
| tree | 537f4bde6fcf72a50abec64b27d4c9f709adb6da /Source/WebKit/qt/WidgetApi/qwebpage.cpp | |
| parent | 5dd4bb67cfce812fd7686e43616e2069f354a7df (diff) | |
| parent | bfa56c39850f4db30ffe6a5026d8bcf34ebaf3e2 (diff) | |
| download | qtwebkit-50f20864b536982ea9aafa1851a2e647144ed6ac.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'Source/WebKit/qt/WidgetApi/qwebpage.cpp')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index 02bddebda..863621391 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -410,7 +410,7 @@ bool QWebPagePrivate::errorPageExtension(QWebPageAdapter::ErrorPageOption *opt, option.domain = QWebPage::QtNetwork; else if (opt->domain == QLatin1String("HTTP")) option.domain = QWebPage::Http; - else if (opt->domain == QLatin1String("WebKit")) + else if (opt->domain == QLatin1String("WebKit") || opt->domain == QLatin1String("WebKitErrorDomain")) option.domain = QWebPage::WebKit; else return false; |