Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2016-02-10 08:33:16 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2016-02-10 08:58:37 (GMT) |
| commit | 062ba3f8d7e99008863499c02224c1aae7b31d8d (patch) | |
| tree | 009f4021e1afd442379c942084dfefb72958f1d5 | |
| parent | 5b33a37d7a46b4c8a33061f7871a919a5d4ae7db (diff) | |
| download | swift-062ba3f8d7e99008863499c02224c1aae7b31d8d.zip swift-062ba3f8d7e99008863499c02224c1aae7b31d8d.tar.bz2 | |
Fix update_translations
As of Qt5, lupdate doesn't accept the -codecfortr option anymore. Qt
sources are now expected to always use UTF-8. Fixed the lupdate command
line so that this option is now only used when building against Qt4.
Test-Information:
Tested on OS X 10.11 using Qt 5.4
Tested on CentOS 6 using Qt 4.6
Change-Id: Ie5bcb383bc2ebded6dc1deb65d988d3b268dc293
| -rw-r--r-- | Swift/QtUI/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 78d6b3e..3ff11a8 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -339,10 +339,13 @@ for lang in translation_languages : if ARGUMENTS.get("update_translations", False) : myenv.Precious(translation_sources) remove_obsolete_option = "" + codecfortr = "" if ARGUMENTS.get("remove_obsolete_translations", False) : remove_obsolete_option = " -no-obsolete" + if qt_version == '4': + codecfortr = "-codecfortr UTF-8" for translation_source in filter(lambda x: not x.endswith("_en.ts"), translation_sources) : - t = myenv.Command([translation_source], [], [myenv.Action("$QT4_LUPDATE -I " + env.Dir("#").abspath + remove_obsolete_option + " -silent -codecfortr utf-8 -recursive Swift -ts " + translation_source, cmdstr = "$QT4_LUPDATECOMSTR")]) + t = myenv.Command([translation_source], [], [myenv.Action("$QT4_LUPDATE -I " + env.Dir("#").abspath + remove_obsolete_option + " -silent " + codecfortr + " -recursive Swift -ts " + translation_source, cmdstr = "$QT4_LUPDATECOMSTR")]) myenv.AlwaysBuild(t) # NSIS installation script |