diff options
Diffstat (limited to 'src/gui/text/windows')
| -rw-r--r-- | src/gui/text/windows/qwindowsfontdatabase.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/windows/qwindowsfontengine.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp index 9ee1c5aba6..79ea08f9b6 100644 --- a/src/gui/text/windows/qwindowsfontdatabase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabase.cpp @@ -485,7 +485,7 @@ static QChar *createFontFile(const QString &faceName) const int nameLength = qMin(faceName.length(), LF_FACESIZE - 1); faceNamePtr = new QChar[nameLength + 1]; memcpy(static_cast<void *>(faceNamePtr), faceName.utf16(), sizeof(wchar_t) * nameLength); - faceNamePtr[nameLength] = 0; + faceNamePtr[nameLength] = u'\0'; } return faceNamePtr; } diff --git a/src/gui/text/windows/qwindowsfontengine.cpp b/src/gui/text/windows/qwindowsfontengine.cpp index 46774fa304..b2855d19dd 100644 --- a/src/gui/text/windows/qwindowsfontengine.cpp +++ b/src/gui/text/windows/qwindowsfontengine.cpp @@ -376,7 +376,7 @@ void QWindowsFontEngine::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::Shape oldFont = SelectObject(hdc, hfont); if (!ttf) { - QChar ch[2] = { ushort(glyph), 0 }; + QChar ch[2] = { ushort(glyph), u'\0' }; int chrLen = 1; if (QChar::requiresSurrogates(glyph)) { ch[0] = QChar::highSurrogate(glyph); |