diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 01:00:18 +0100 |
| commit | aa3226bab32ee24dcf8f88c604638b83ed480f4d (patch) | |
| tree | 5de4e7f54c3aaeddc9f651a8d357fb406117406a /src/gui/text/qtextdocument.cpp | |
| parent | 1559c328d536ceb8b7f78892a60aced4716b40b6 (diff) | |
| parent | 65cafea7976d8c5124a5802da004dbd9e27d4b79 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 46cfc79643..64ba01d4e5 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -904,6 +904,9 @@ int QTextDocument::lineCount() const Returns the number of characters of this document. + \note As a QTextDocument always contains at least one + QChar::ParagraphSeparator, this method will return at least 1. + \sa blockCount(), characterAt() */ int QTextDocument::characterCount() const |