summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/text/qunicodetools.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/text/qunicodetools.cpp b/src/corelib/text/qunicodetools.cpp
index 634a3da4890..c0cb43a0685 100644
--- a/src/corelib/text/qunicodetools.cpp
+++ b/src/corelib/text/qunicodetools.cpp
@@ -2819,10 +2819,10 @@ Q_CORE_EXPORT void initCharAttributes(QStringView string,
Q_CORE_EXPORT void initScripts(QStringView string, ScriptItemArray *scripts)
{
qsizetype sor = 0;
- qsizetype eor = 0;
QChar::Script script = QChar::Script_Common;
- for (qsizetype i = 0; i < string.size(); ++i, eor = i) {
+ for (qsizetype i = 0; i < string.size(); ++i) {
+ const auto eor = i;
char32_t ucs4 = string[i].unicode();
if (QChar::isHighSurrogate(ucs4) && i + 1 < string.size()) {
ushort low = string[i + 1].unicode();
@@ -2863,7 +2863,6 @@ Q_CORE_EXPORT void initScripts(QStringView string, ScriptItemArray *scripts)
}
Q_ASSERT(script >= QChar::Script_Common);
- Q_ASSERT(eor == string.size());
scripts->append(ScriptItem{sor, script});
}