diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-09-03 12:15:26 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-11 09:34:36 +0000 |
| commit | 6fbc830e0ebeb66a5570e8c432c27658670cd071 (patch) | |
| tree | 7ebbda0dbf05323191bf8389294be78fdbaf607e | |
| parent | 160672dab76f526d1035d48eacd83a51e146b5c8 (diff) | |
| download | qttranslations-5.5.tar.gz | |
- Add auto-generated _en.ts files to .gitignore.
- Let git do the globbing by passing the pattern on to git so that
git add will not bail out with error when encountering
a file listed in .gitignore.
Task-number: QTBUG-48075
Change-Id: I2ab328a9ef4574e15742af2dafecda52f795685a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -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 738d04c..83e3f66 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -77,19 +77,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 = \ |