From 062ba3f8d7e99008863499c02224c1aae7b31d8d Mon Sep 17 00:00:00 2001
From: Edwin Mons <edwin.mons@isode.com>
Date: Wed, 10 Feb 2016 09:33:16 +0100
Subject: 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

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
-- 
cgit v0.10.2-6-g49f6