diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-22 17:48:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-22 17:48:17 (GMT) |
| commit | d244b46490a6c5e1d9179c46683811ad56557809 (patch) | |
| tree | 696d43a393d5a2785448e0dcb0566f57a000b70c /qtools/qstring.cpp | |
| parent | a6da9a48ad520206462632496fc4c83d72bffe5a (diff) | |
| parent | 786f8c9d2b55ebcde9e2702fc9dfc8ab1e4609b6 (diff) | |
| download | Doxygen-d244b46490a6c5e1d9179c46683811ad56557809.zip Doxygen-d244b46490a6c5e1d9179c46683811ad56557809.tar.gz Doxygen-d244b46490a6c5e1d9179c46683811ad56557809.tar.bz2 | |
Merge branch 'master' into feature/bug_550158
Diffstat (limited to 'qtools/qstring.cpp')
| -rw-r--r-- | qtools/qstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtools/qstring.cpp b/qtools/qstring.cpp index 0e2b14a..e809d0d 100644 --- a/qtools/qstring.cpp +++ b/qtools/qstring.cpp @@ -11538,7 +11538,7 @@ static inline bool format(QChar::Decomposition tag, QString & str, Applies possible ligatures to a QString, useful when composition-rich text requires rendering with glyph-poor fonts, but also makes compositions such as QChar(0x0041) ('A') and QChar(0x0308) - (Unicode accent diaresis) giving QChar(0x00c4) (German A Umlaut). + (Unicode accent diaeresis) giving QChar(0x00c4) (German A Umlaut). */ void QString::compose() { |