summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate/cpp.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-19 21:09:28 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-19 21:09:28 (GMT)
commitae653c8ff92c23c3f9ebbdb753a1e0edea95be7e (patch)
treea9d3256598d0011aa3dd70c809b373c59e6cbe7c /tools/linguist/lupdate/cpp.cpp
parent70f482d84022da55b8cc7580d9993a339165219b (diff)
downloadQt-ae653c8ff92c23c3f9ebbdb753a1e0edea95be7e.zip
Qt-ae653c8ff92c23c3f9ebbdb753a1e0edea95be7e.tar.gz
Qt-ae653c8ff92c23c3f9ebbdb753a1e0edea95be7e.tar.bz2
don't overwrite explicitly specified CODECFORTR on UTF-16 input
Diffstat (limited to 'tools/linguist/lupdate/cpp.cpp')
-rw-r--r--tools/linguist/lupdate/cpp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index bd7d4ec..7c9b27a 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -2151,7 +2151,7 @@ void loadCPP(Translator &translator, const QStringList &filenames, ConversionDat
ts.setCodec(codec);
ts.setAutoDetectUnicode(true);
parser.setInput(ts, filename);
- if (ts.codec()->name() == "UTF-16")
+ if (cd.m_outputCodec.isEmpty() && ts.codec()->name() == "UTF-16")
translator.setCodecName("System");
Translator *tor = new Translator;
tor->setCodecName(translator.codecName());