From 0c745b89b4da0c12151829905a6f881ad8663e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Fri, 23 Dec 2016 12:04:57 +0100 Subject: Update Chromium Include compilation fix introduced on the 5.8 branch. Change-Id: Ia665ddb80374bfc532ad8e90be6b59aab48b5485 Task-number: QTBUG-57774 Reviewed-by: Joerg Bornemann Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- src/core/renderer/print_web_view_helper_delegate_qt.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/3rdparty b/src/3rdparty index b7d1c5bec..a47c04aeb 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit b7d1c5beca83179c4803cf4dc128fc814295db3f +Subproject commit a47c04aeb6fb1d4d9016fd03ca7f98168c9a5f9e diff --git a/src/core/renderer/print_web_view_helper_delegate_qt.cpp b/src/core/renderer/print_web_view_helper_delegate_qt.cpp index 6d74685fe..25ee2c32b 100644 --- a/src/core/renderer/print_web_view_helper_delegate_qt.cpp +++ b/src/core/renderer/print_web_view_helper_delegate_qt.cpp @@ -41,6 +41,7 @@ #include "print_web_view_helper_delegate_qt.h" #include "third_party/WebKit/public/web/WebElement.h" +#include "web_engine_library_info.h" namespace QtWebEngineCore { PrintWebViewHelperDelegateQt::~PrintWebViewHelperDelegateQt() @@ -70,3 +71,11 @@ bool PrintWebViewHelperDelegateQt::OverridePrint(blink::WebLocalFrame* frame) } } + +namespace printing { +// std::string PrintingContextDelegate::GetAppLocale() +std::string getApplicationLocale() +{ + return WebEngineLibraryInfo::getApplicationLocale(); +} +} -- cgit v1.2.3