diff options
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qalgorithms.qdoc | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc index f0ac2701e7..a73ec1e22a 100644 --- a/src/corelib/tools/qalgorithms.qdoc +++ b/src/corelib/tools/qalgorithms.qdoc @@ -29,6 +29,7 @@ \headerfile <QtAlgorithms> \title Generic Algorithms \ingroup funclists + \keyword generic algorithms \brief The <QtAlgorithms> header includes the generic, template-based algorithms. diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 1c8e47267d..6030d7058c 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -7996,7 +7996,7 @@ QString QString::repeated(int times) const void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::UnicodeVersion version, int from) { const QChar *p = data->constData() + from; - if (isAscii(p, p + data->length())) + if (isAscii(p, p + data->length() - from)) return; if (p > data->constData() + from) from = p - data->constData() - 1; // need one before the non-ASCII to perform NFC |