diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-12 01:00:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-12 01:00:42 +0200 |
| commit | fd2d9de51e324936a1e0d809e3f49c245a10d016 (patch) | |
| tree | 57587870ba4aac8ae3625eb438cad78016a65ee0 /src/corelib/text/qstring.cpp | |
| parent | 135aa77021519ef833c807d49d4fe3428ab970e5 (diff) | |
| parent | 3f8e754f07db944dc74d84cc1c24d3e11677ad09 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Icaabf08f9af539ddf844d96bc9c3a2d09408ba8a
Diffstat (limited to 'src/corelib/text/qstring.cpp')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 2a98b169f3..44c6582d63 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -2091,7 +2091,7 @@ int QString::toUcs4_helper(const ushort *uc, int length, uint *out) If \a size is negative, \a unicode is assumed to point to a \\0'-terminated array and its length is determined dynamically. The terminating - nul-character is not considered part of the string. + null character is not considered part of the string. QString makes a deep copy of the string data. The unicode data is copied as is and the Byte Order Mark is preserved if present. @@ -5769,7 +5769,7 @@ QString QString::trimmed_helper(QString &str) The return value is of type QCharRef, a helper class for QString. When you get an object of type QCharRef, you can use it as if it - were a QChar &. If you assign to it, the assignment will apply to + were a reference to a QChar. If you assign to it, the assignment will apply to the character in the QString from which you got the reference. \note Before Qt 5.14 it was possible to use this operator to access |