diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-16 15:21:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-16 16:38:33 +0100 |
| commit | b13150336174083962d90922761fd96f07e173b4 (patch) | |
| tree | 1655e9009efba21b008d7d2f810aacbde3e2c2d8 /src/gui/text | |
| parent | ff19ebcc2d9c9668af24fe8add9f70c160776367 (diff) | |
| parent | 9bfe3ab71e5291445e66be96d6cd1f63934a2d83 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure
configure.pri
examples/widgets/painting/fontsampler/mainwindow.cpp
examples/widgets/painting/fontsampler/mainwindow.h
mkspecs/features/moc.prf
src/corelib/global/qglobal.h
src/gui/text/qtextdocument.cpp
Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 5e9fac5f86..6074917087 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -1163,9 +1163,12 @@ QString QTextDocument::toRawText() const formatting information use a QTextCursor instead. This function returns the same as toRawText(), but will replace - some unicode characters, such as line separators and non-breaking - spaces, with ASCII alternatives. If you need the precise contents - of the document, use toRawText() instead. + some unicode characters with ASCII alternatives. + In particular, no-break space (U+00A0) is replaced by a regular + space (U+0020), and both paragraph (U+2029) and line (U+2028) + separators are replaced by line feed (U+000A). + If you need the precise contents of the document, use toRawText() + instead. \note Embedded objects, such as images, are represented by a Unicode value U+FFFC (OBJECT REPLACEMENT CHARACTER). |