diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-07 01:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-07 01:00:10 +0100 |
| commit | cf00c01f68198f55e0be5de4d9b720a31dea1a21 (patch) | |
| tree | 0d119a5be7ef2a258858ded2b264e96d6cd5a572 /src/gui/text | |
| parent | ada1b61991b16f21c5cd9c785dc7fbfa832f18be (diff) | |
| parent | 3eb42abab6c7d1f3a32ca55c972b1d7a4a703658 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I110feec4750bd304975bab4f3f33d3a61a4e08bd
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfont.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 220e89a0c4..c7fff266ad 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -1328,7 +1328,7 @@ QFont::StyleHint QFont::styleHint() const order to display them correctly. In some writing systems, such as Brahmic scripts, this is required in order for the text to be legible, but in e.g. Latin script, it is merely a cosmetic feature. The PreferNoShaping flag will disable all such features when they - are not required, which will improve performance in most cases. + are not required, which will improve performance in most cases (since Qt 5.10). Any of these may be OR-ed with one of these flags: |