summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2018-07-17 18:20:12 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-07-17 18:20:12 +0000
commitcc5d8168001e652c045ff42685edf257ce00603c (patch)
tree6320f169d621bed128f08d92676035a8e2f2ab23 /src/corelib/tools/qstring.cpp
parenta9dfe71cca38e6b62445292ed2c6ec1c8224430a (diff)
parent1783fca89768a9d503d886673643dc4542ec467f (diff)
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
-rw-r--r--src/corelib/tools/qstring.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 0cca0823ec5..b25e63e1156 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -1359,7 +1359,7 @@ const QString::Null QString::null = { };
\ingroup string-processing
QString stores a string of 16-bit \l{QChar}s, where each QChar
- corresponds one Unicode 4.0 character. (Unicode characters
+ corresponds to one UTF-16 code unit. (Unicode characters
with code values above 65535 are stored using surrogate pairs,
i.e., two consecutive \l{QChar}s.)