1 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index d33af45912..12c3186a71 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -9707,8 +9707,14 @@ qsizetype QtPrivate::count(QStringView haystack, const QRegularExpression &re)
         QRegularExpressionMatch match = re.matchView(haystack, index + 1);
         if (!match.hasMatch())
             break;
-        index = match.capturedStart();
         count++;
+
+        // Search again, from the next character after the beginning of this
+        // capture. If the capture starts with a surrogate pair, both together
+        // count as "one character".
+        index = match.capturedStart();
+        if (index < len && haystack[index].isHighSurrogate())
+            ++index;
     }
     return count;
 }