diff options
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/resource_bundle_qt.cpp | 9 | ||||
| -rwxr-xr-x | tools/buildscripts/repack_locales.py | 10 |
3 files changed, 1 insertions, 18 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 2c3ccc7994980d954ec0188ea3fa3d27424ef32 +Subproject 1c64c9878f36c83b18c2e81aafe6eedc2a67488 diff --git a/src/core/resource_bundle_qt.cpp b/src/core/resource_bundle_qt.cpp index 2487cdbd1..d69ae05e1 100644 --- a/src/core/resource_bundle_qt.cpp +++ b/src/core/resource_bundle_qt.cpp @@ -47,15 +47,6 @@ void ResourceBundle::LoadCommonResources() AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_PAK), SCALE_FACTOR_100P); } -// As GetLocaleFilePath is excluded for Mac in resource_bundle.cc, -// we have to add a replacement for it using the inverted logic. -#if defined(OS_MACOSX) -base::FilePath ResourceBundle::GetLocaleFilePath(const std::string& /*app_locale*/, bool /*test_file_exists*/) -{ - return base::FilePath(); -} -#endif - gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { LOG(WARNING) << "Unable to load image with id " << resource_id; diff --git a/tools/buildscripts/repack_locales.py b/tools/buildscripts/repack_locales.py index 05e2895ed..389e9b1fd 100755 --- a/tools/buildscripts/repack_locales.py +++ b/tools/buildscripts/repack_locales.py @@ -77,15 +77,7 @@ class Usage(Exception): def calc_output(locale): """Determine the file that will be generated for the given locale.""" #e.g. '<(INTERMEDIATE_DIR)/repack/qtwebengine_locales/da.pak', - if OS == 'mac' or OS == 'ios': - # For Cocoa to find the locale at runtime, it needs to use '_' instead - # of '-' (http://crbug.com/20441). Also, 'en-US' should be represented - # simply as 'en' (http://crbug.com/19165, http://crbug.com/25578). - if locale == 'en-US': - locale = 'en' - return '%s/repack/qtwebengine_locales/%s.lproj/locale.pak' % (INT_DIR, locale.replace('-', '_')) - else: - return os.path.join(INT_DIR, 'repack/qtwebengine_locales', locale + '.pak') + return os.path.join(INT_DIR, 'repack/qtwebengine_locales', locale + '.pak') def calc_inputs(locale): |