summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2016-12-23 12:04:57 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2017-01-02 06:50:35 +0000
commit0c745b89b4da0c12151829905a6f881ad8663e7b (patch)
tree5335bffd47ef21375534a73110fd5c58de38f38c
parent4723e88f6ec4aeadb35d65cfebbbb471ad8eb784 (diff)
Update Chromium
Include compilation fix introduced on the 5.8 branch. Change-Id: Ia665ddb80374bfc532ad8e90be6b59aab48b5485 Task-number: QTBUG-57774 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
m---------src/3rdparty0
-rw-r--r--src/core/renderer/print_web_view_helper_delegate_qt.cpp9
2 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject b7d1c5beca83179c4803cf4dc128fc814295db3
+Subproject a47c04aeb6fb1d4d9016fd03ca7f98168c9a5f9
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 6d74685f..25ee2c32 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();
+}
+}