Mercurial > hg > easyhg
comparison 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 |
comparison
equal
deleted
inserted
replaced
665:88061103b878 | 672:88fa1544b407 |
---|---|
297 } | 297 } |
298 // unescaped backslash followed by u and at least four more | 298 // unescaped backslash followed by u and at least four more |
299 // chars: replace with Unicode character | 299 // chars: replace with Unicode character |
300 if (i+5 < s.length() && s[i] == '\\' && s[i+1] == 'u') { | 300 if (i+5 < s.length() && s[i] == '\\' && s[i+1] == 'u') { |
301 QString uni = s.mid(i+2, 4); | 301 QString uni = s.mid(i+2, 4); |
302 QByteArray ba = QByteArray::fromHex(uni.toAscii()); | 302 QByteArray ba = QByteArray::fromHex(uni.toLatin1()); |
303 d += QChar(ba[1], ba[0]); | 303 d += QChar(ba[1], ba[0]); |
304 i += 5; | 304 i += 5; |
305 continue; | 305 continue; |
306 } | 306 } |
307 // default case: leave alone | 307 // default case: leave alone |