summaryrefslogtreecommitdiffstats
path: root/tools/buildscripts
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-06-17 16:15:35 +0200
committerPierre Rossi <pierre.rossi@gmail.com>2014-08-04 17:22:42 +0200
commit7d90b44187cfa8f93df6a6341da41cf8192d18ad (patch)
tree47384a6837549df6c80759ae270bbd8651477bde /tools/buildscripts
parent35d66ce48248f07759cbe2a17437198e8e1948ed (diff)
Expose better error information in loadRequest.
Use the chromium localized error strings for that purpose, otherwise the error description is always empty. While we're at it, let's tap into the chromium error pages, which should hopefully make sense for most errors, and add some static asserts to check that the qt quick enum and the core one are in sync. Change-Id: Icf8fa7c3bf4a674c60a10950422135fb6930447a Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/buildscripts')
-rwxr-xr-xtools/buildscripts/repack_locales.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/buildscripts/repack_locales.py b/tools/buildscripts/repack_locales.py
index eabc04e9f..05e2895ed 100755
--- a/tools/buildscripts/repack_locales.py
+++ b/tools/buildscripts/repack_locales.py
@@ -105,6 +105,15 @@ def calc_inputs(locale):
inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'app_locale_settings',
'app_locale_settings_%s.pak' % locale))
+ # Used for localized error messages and error pages
+ #e.g. '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_da.pak'
+ inputs.append(os.path.join(SHARE_INT_DIR, 'chrome',
+ 'generated_resources_%s.pak' % locale))
+
+ #e.g. '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_da.pak'
+ inputs.append(os.path.join(SHARE_INT_DIR, 'chrome',
+ 'chromium_strings_%s.pak' % locale))
+
# Add any extra input files.
for extra_file in EXTRA_INPUT_FILES:
inputs.append('%s_%s.pak' % (extra_file, locale))