diff options
author | Katja Marttila <katja.marttila@qt.io> | 2019-05-27 11:35:27 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2019-05-27 11:45:32 +0300 |
commit | 3946e2f8607282e054a76b119f1819b2535a0b8a (patch) | |
tree | f74144f8c5a1c4889bf81c89622567f564571fc8 /src/sdk/translations/translations.pro | |
parent | 8c448f77a00d01e24e4d083d9684c275b3efdd04 (diff) | |
parent | 6ea22a1a9ef9d9be25e09740aa72bb0a5dfebfc7 (diff) |
Merge remote-tracking branch 'origin/3.1' into master
Change-Id: I65e3ed3858cda954a5f916031d4ff02a39a9aa87
Diffstat (limited to 'src/sdk/translations/translations.pro')
-rw-r--r-- | src/sdk/translations/translations.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sdk/translations/translations.pro b/src/sdk/translations/translations.pro index 8a77a0b44..a951a5b53 100644 --- a/src/sdk/translations/translations.pro +++ b/src/sdk/translations/translations.pro @@ -21,12 +21,13 @@ for(file, IB_ALL_TRANSLATIONS) { ts-all.commands = cd $$wd && $$LUPDATE $$lupdate_opts $$sources -ts $$IB_ALL_TRANSLATIONS QMAKE_EXTRA_TARGETS += ts-all +lconvert_options = -sort-contexts -locations none -i isEqual(QMAKE_DIR_SEP, /) { commit-ts.commands = \ cd $$wd; \ git add -N src/sdk/translations/*_??.ts && \ for f in `git diff-files --name-only src/sdk/translations/*_??.ts`; do \ - $$LCONVERT -locations none -i \$\$f -o \$\$f; \ + $$LCONVERT $$lconvert_options \$\$f -o \$\$f; \ done; \ git add src/sdk/translations/*_??.ts && git commit } else { @@ -34,7 +35,7 @@ isEqual(QMAKE_DIR_SEP, /) { cd $$wd && \ git add -N src/sdk/translations/*_??.ts && \ for /f usebackq %%f in (`git diff-files --name-only src/sdk/translations/*_??.ts`) do \ - $$LCONVERT -locations none -i %%f -o %%f $$escape_expand(\\n\\t) \ + $$LCONVERT $$lconvert_options %%f -o %%f $$escape_expand(\\n\\t) \ cd $$wd && git add src/sdk/translations/*_??.ts && git commit } QMAKE_EXTRA_TARGETS += commit-ts |