diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:50:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:50:12 +0200 |
| commit | 9c6d1af76ac28de8d59be344ea3a21b2607fa118 (patch) | |
| tree | 889efc587da721cf54720169eed349f33bff9c74 | |
| parent | 1a1bf9d6cb78e39047d92c214b45404f8c0c424e (diff) | |
| parent | 6fbc830e0ebeb66a5570e8c432c27658670cd071 (diff) | |
| download | qttranslations-9c6d1af76ac28de8d59be344ea3a21b2607fa118.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I984770b869d735bc4d7cbd99242e944a47d588c0
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | translations/translations.pro | 8 |
2 files changed, 5 insertions, 4 deletions
@@ -115,6 +115,7 @@ tests/auto/qresourceengine/runtime_resource.rcc tools/activeqt/testcon/testcon.tlb translations/*.qm translations/*_untranslated.ts +translations/*_en.ts qrc_*.cpp # Test generated files diff --git a/translations/translations.pro b/translations/translations.pro index 3935c6f..acfd659 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -78,19 +78,19 @@ check-ts.depends = ts-all isEqual(QMAKE_DIR_SEP, /) { commit-ts.commands = \ cd $$PWD/..; \ - git add -N translations/*_??.ts && \ + git add -N \"translations/*_??.ts\" && \ for f in `git diff-files --name-only translations/*_??.ts`; do \ $$LCONVERT -locations none -i \$\$f -o \$\$f; \ done; \ - git add translations/*_??.ts && git commit + git add \"translations/*_??.ts\" && git commit } else { wd = $$replace(PWD, /, \\)\\.. commit-ts.commands = \ cd $$wd && \ - git add -N translations/*_??.ts && \ + git add -N \"translations/*_??.ts\" && \ for /f usebackq %%f in (`git diff-files --name-only translations/*_??.ts`) do \ $$LCONVERT -locations none -i %%f -o %%f $$escape_expand(\\n\\t) \ - cd $$wd && git add translations/*_??.ts && git commit + cd $$wd && git add \"translations/*_??.ts\" && git commit } ts.commands = \ |