diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 13:24:25 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 14:28:00 +0100 |
| commit | 9316b8c27c4d63ee755517fb4670268424200b3c (patch) | |
| tree | a9818fd5a8798ec56add7cd622fb13cee525557a /src/core/resources | |
| parent | ad46ffd2e74b17cd7e7b8a7d73590696cc8febce (diff) | |
| parent | 03a52863226aeb774721db610ba831808b30836a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/access_token_store_qt.cpp
src/core/access_token_store_qt.h
src/core/content_browser_client_qt.cpp
Change-Id: Id319ad0d87ce071e63d9c6c22b4fc35523ddfa74
Diffstat (limited to 'src/core/resources')
| -rw-r--r-- | src/core/resources/repack_locales.gypi | 2 | ||||
| -rw-r--r-- | src/core/resources/resources.gyp | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/core/resources/repack_locales.gypi b/src/core/resources/repack_locales.gypi index ca3507912..d24da1b5d 100644 --- a/src/core/resources/repack_locales.gypi +++ b/src/core/resources/repack_locales.gypi @@ -13,7 +13,7 @@ '<!@pymod_do_main(repack_locales -i -p <(OS) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(repack_extra_flags) <(locales))' ], 'outputs': [ - '<!@pymod_do_main(repack_locales -o -p <(OS) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(locales))' + '<@(locale_files)' ], 'action': [ '<@(repack_locales_script)', diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp index f07facca6..835a87cdf 100644 --- a/src/core/resources/resources.gyp +++ b/src/core/resources/resources.gyp @@ -9,6 +9,9 @@ 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk', 'vi', 'zh-CN', 'zh-TW', ], + 'locale_files': ['<!@pymod_do_main(repack_locales -o -p <(OS) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))'], + 'qt_install_data%': '', + 'qt_install_translations%': '', }, 'dependencies': [ '<(chromium_src_dir)/webkit/webkit_resources.gyp:webkit_strings', @@ -29,7 +32,25 @@ 'action_name': 'repack_locales', 'includes': [ 'repack_locales.gypi' ], }, - ] + ], + 'conditions': [ + ['qt_install_data != ""', { + 'copies': [ + { + 'destination': '<(qt_install_data)', + 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak' ], + }, + ], + }], + ['qt_install_translations != ""', { + 'copies': [ + { + 'destination': '<(qt_install_translations)/qtwebengine_locales', + 'files': [ '<@(locale_files)' ], + }, + ], + }], + ], } ] } |