diff --git a/chromium/base/base_paths.h b/chromium/base/base_paths.h index 26b2fd4c9a101e2cb8d1b5ca279495a6f40768bc..5db3c39e80040dc05c7fd164fd48a6b66d535bf4 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 e0bd62cc50b0fe824d25beacbc94bb42e20908b7..d06fbe3dad3062b507fc10f81e911baf24c38028 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.