diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-04-18 18:55:25 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-04-23 18:53:43 +0000 |
| commit | 21968aed886e45c0514a2b770bc678c07a204d89 (patch) | |
| tree | 1b40482172ac70dcadc914f7baab15a51022c957 /src | |
| parent | b8724729191957066ce19786d6de9ee9ccf045e8 (diff) | |
Fix tests on non-latin systems
Qt Creator uses non-latin letters in path to the build directory in case
of ru_RU.UTF-8 $LANG on Linux. Now QBS does handle that correctly.
Change-Id: Ifc727b120a5f0ee60972c5e3ed24067426db8df2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/jsextensions/utilitiesextension.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp index 62778665c..b425bb4a2 100644 --- a/src/lib/corelib/jsextensions/utilitiesextension.cpp +++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp @@ -236,7 +236,7 @@ static inline QString escapedString(const Char *begin, int length, bool isUnicod // Surrogate characters are category Cs (Other_Surrogate), so isPrintable = false for them int runLength = 0; while (p + runLength != end && - isPrintable(p[runLength]) && p[runLength] != '\\' && p[runLength] != '"') + QChar::isPrint(p[runLength]) && p[runLength] != '\\' && p[runLength] != '"') ++runLength; if (runLength) { out += QString(reinterpret_cast<const QChar *>(p), runLength); @@ -288,7 +288,7 @@ static inline QString escapedString(const Char *begin, int length, bool isUnicod if ((p + 1) != end && QChar::isLowSurrogate(p[1])) { // properly-paired surrogates uint ucs4 = QChar::surrogateToUcs4(*p, p[1]); - if (isPrintable(ucs4)) { + if (QChar::isPrint(ucs4)) { buf[0] = *p; buf[1] = p[1]; buflen = 2; |