diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-01 10:21:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-01 19:20:20 +0200 |
| commit | 57fccd6f2156e097fb902789a61731905487c543 (patch) | |
| tree | d0114319e7016538d0ca4ffca2e77beb312b38e5 /src/corelib/kernel | |
| parent | 8f4baa3a223ad6f12101d5c4c10756a98d340ae6 (diff) | |
| parent | d25c3227299a6a281db37e68e45f0b02db3f5297 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qtranslator.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index dc0ab9f08a..637ef84d21 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -948,11 +948,8 @@ static QString getMessage(const uchar *m, const uchar *end, const char *context, end: if (!tn) return QString(); - QString str = QString((const QChar *)tn, tn_length/2); - if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) { - QChar *data = str.data(); - qbswap<sizeof(QChar)>(data, str.length(), data); - } + QString str(tn_length / 2, Qt::Uninitialized); + qFromBigEndian<ushort>(tn, str.length(), str.data()); return str; } |