diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 19:59:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 19:59:08 +0100 |
| commit | 2a1292b9168d40e71c9e67a41d3b8c499b8e222b (patch) | |
| tree | 071014337919d63a62718ea6979fd48775ad61df /src/gui/text | |
| parent | 2be7746e0922fa404da567fd0bc0cbc00c6215cb (diff) | |
| parent | c204f6e417fe9b10df29e0ba00c7a94e0aa52cef (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I4b56ce8c76729d9fc60995564299f8f27336fcde
Diffstat (limited to 'src/gui/text')
| -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 c363807e5e..1719855e68 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -1022,8 +1022,8 @@ void QFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metr Returns \c true if the font table idetified by \a tag exists in the font; returns \c false otherwise. - If \a buffer is NULL, stores the size of the buffer required for the font table data, - in bytes, in \a length. If \a buffer is not NULL and the capacity + If \a buffer is \nullptr, stores the size of the buffer required for the font table data, + in bytes, in \a length. If \a buffer is not \nullptr and the capacity of the buffer, passed in \a length, is sufficient to store the font table data, also copies the font table data to \a buffer. |