diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-04-27 11:17:31 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-04-30 00:30:57 +0200 |
| commit | 7a8b277d5bcfd3597b6634e0402ac5f7202d9b71 (patch) | |
| tree | b11a82c51198bff3b817085aa4378dea976d9e24 /src/gui/text/qfontengine.cpp | |
| parent | 1337e8fe46ac7934f80b8a95b84b5cb61707f8e4 (diff) | |
QtGui: fix a few more char/int/uint -> QChar conversions
They were masked by all QChar ctors being made explicit, except the
char16_t one, which was left as the only viable choice.
Change-Id: I343269b61d555c259b5780011e99f85f5375ef78
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 1269aefbf2..c260c06fe4 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -1834,12 +1834,12 @@ bool QFontEngineMulti::stringToCMap(const QChar *str, int len, int lastFallback = -1; while (it.hasNext()) { - const uint ucs4 = it.peekNext(); + const char32_t ucs4 = it.peekNext(); // If we applied a fallback font to previous glyph, and the current is either // ZWJ or ZWNJ, we should also try applying the same fallback font to that, in order // to get the correct shaping rules applied. - if (lastFallback >= 0 && (ucs4 == QChar(0x200d) || ucs4 == QChar(0x200c))) { + if (lastFallback >= 0 && (ucs4 == 0x200d || ucs4 == 0x200c)) { QFontEngine *engine = m_engines.at(lastFallback); glyph_t glyph = engine->glyphIndex(ucs4); if (glyph != 0) { |