diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-31 08:30:44 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-07 11:21:47 (GMT) |
| commit | c39436c722e778460366995877d66a8935d2d636 (patch) | |
| tree | 46d367e5c7f6786ff5b60f9824cefc6e1d22b2f7 | |
| parent | 3eb12a43e3cf673ec0608833551b25f153af1aa3 (diff) | |
| download | Qt-c39436c722e778460366995877d66a8935d2d636.zip Qt-c39436c722e778460366995877d66a8935d2d636.tar.gz Qt-c39436c722e778460366995877d66a8935d2d636.tar.bz2 | |
Fix compilation with xlC 7: operands to ?: must match.
See 3ae2cab9c8bd1790a00da2755ac036143a3a35f4 for another similar fix.
Reviewed-by: Trust Me
(cherry picked from commit 18fbfdf0f774198e2e1277e064cc3a8eb9dbb29d)
| -rw-r--r-- | tools/linguist/shared/po.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/shared/po.cpp b/tools/linguist/shared/po.cpp index 4850cfd..575e751 100644 --- a/tools/linguist/shared/po.cpp +++ b/tools/linguist/shared/po.cpp @@ -359,7 +359,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd) const QChar quote = QLatin1Char('"'); const QChar newline = QLatin1Char('\n'); QTextStream in(&dev); - in.setCodec(cd.m_codecForSource.isEmpty() ? "UTF-8" : cd.m_codecForSource); + in.setCodec(cd.m_codecForSource.isEmpty() ? QByteArray("UTF-8") : cd.m_codecForSource); bool error = false; // format of a .po file entry: @@ -552,7 +552,7 @@ bool savePO(const Translator &translator, QIODevice &dev, ConversionData &cd) { bool ok = true; QTextStream out(&dev); - out.setCodec(cd.m_outputCodec.isEmpty() ? "UTF-8" : cd.m_outputCodec); + out.setCodec(cd.m_outputCodec.isEmpty() ? QByteArray("UTF-8") : cd.m_outputCodec); bool first = true; if (translator.messages().isEmpty() || !translator.messages().first().sourceText().isEmpty()) { |