Mercurial > hg > easyhg
diff src/common.cpp @ 672:88fa1544b407
Merge from branch qt5. There's much more to be done before we can make another release, but clearly it's going to be done using qt5
author | Chris Cannam |
---|---|
date | Wed, 05 Dec 2018 09:44:10 +0000 |
parents | f9b805d8cab4 |
children | c0b46d0514a7 |
line wrap: on
line diff
--- a/src/common.cpp Wed Mar 23 14:49:49 2016 +0000 +++ b/src/common.cpp Wed Dec 05 09:44:10 2018 +0000 @@ -299,7 +299,7 @@ // chars: replace with Unicode character if (i+5 < s.length() && s[i] == '\\' && s[i+1] == 'u') { QString uni = s.mid(i+2, 4); - QByteArray ba = QByteArray::fromHex(uni.toAscii()); + QByteArray ba = QByteArray::fromHex(uni.toLatin1()); d += QChar(ba[1], ba[0]); i += 5; continue;