diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-30 14:40:06 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-07 11:21:35 (GMT) |
| commit | 3eb12a43e3cf673ec0608833551b25f153af1aa3 (patch) | |
| tree | 0eb727fe78ce6308a2e7d6eda85552ea7f0ae3ac | |
| parent | 923134936e132e857b663c4837f66565dfa3d9e6 (diff) | |
| download | Qt-3eb12a43e3cf673ec0608833551b25f153af1aa3.zip Qt-3eb12a43e3cf673ec0608833551b25f153af1aa3.tar.gz Qt-3eb12a43e3cf673ec0608833551b25f153af1aa3.tar.bz2 | |
Fix compilation with xlC 7: operands to ?: must match.
"../shared/qm.cpp", line 556.45: 1540-0207 (S) No common type found for operands with type "const char [7]" and "QByteArray".
Reviewed-by: Trust Me
(cherry picked from commit 3ae2cab9c8bd1790a00da2755ac036143a3a35f4)
| -rw-r--r-- | tools/linguist/shared/qm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/shared/qm.cpp b/tools/linguist/shared/qm.cpp index 381f5c5..231ec84 100644 --- a/tools/linguist/shared/qm.cpp +++ b/tools/linguist/shared/qm.cpp @@ -546,7 +546,7 @@ bool loadQM(Translator &translator, QIODevice &dev, ConversionData &cd) //qDebug() << "NUMITEMS: " << numItems; QTextCodec *codec = QTextCodec::codecForName( - cd.m_codecForSource.isEmpty() ? "Latin1" : cd.m_codecForSource); + cd.m_codecForSource.isEmpty() ? QByteArray("Latin1") : cd.m_codecForSource); QTextCodec *utf8Codec = 0; if (codec->name() != "UTF-8") utf8Codec = QTextCodec::codecForName("UTF-8"); |