From 748aea3e99405d967c40197fc7939b1c3c1715de Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Mon, 28 Jul 2014 15:01:41 +0200
Subject: [PATCH] <chromium> Add a hook to provide our own icu data file path
Qt will always use QLibraryInfo to determine where this file was
installed, regardless of the platform.
Change-Id: I79374655356d872b2bc766ec8a33fcba343e9c95
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
chromium/base/base_paths.h | 2 ++
chromium/base/i18n/icu_util.cc | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/chromium/base/base_paths.h b/chromium/base/base_paths.h
index 26b2fd4c9a1..5db3c39e800 100644
--- a/chromium/base/base_paths.h
+++ b/chromium/base/base_paths.h
@@ -47,6 +47,8 @@ enum BasePathKey {
DIR_TEST_DATA, // Used only for testing.
+ DIR_QT_LIBRARY_DATA,
+
PATH_END
};
diff --git a/chromium/base/i18n/icu_util.cc b/chromium/base/i18n/icu_util.cc
index e0bd62cc50b..d06fbe3dad3 100644
--- a/chromium/base/i18n/icu_util.cc
+++ b/chromium/base/i18n/icu_util.cc
@@ -121,7 +121,12 @@ bool InitializeICU() {
// be released.
CR_DEFINE_STATIC_LOCAL(base::MemoryMappedFile, mapped_file, ());
if (!mapped_file.IsValid()) {
-#if !defined(OS_MACOSX)
+#if defined(TOOLKIT_QT)
+ FilePath data_path;
+ bool path_ok = PathService::Get(base::DIR_QT_LIBRARY_DATA, &data_path);
+ DCHECK(path_ok);
+ data_path = data_path.AppendASCII(ICU_UTIL_DATA_FILE_NAME);
+#elif !defined(OS_MACOSX)
FilePath data_path;
#if defined(OS_WIN)
// The data file will be in the same directory as the current module.
--
GitLab