Change QStringBuilder to use UTF-8 too

This commit completes the previous commit so that both QString and
QStringBuilder now operate on UTF-8 input.

A small fix was required in QStringBuilder: an if clause isn't enough
to separate the two append versions. Since there are no QString
functions that append to char*, if we're converting to a QByteArray,
we need to go through a QString first in a separate function.

Change-Id: Ic503340c5d0c32d420c90c91cc2e0fc1ae9230f3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

1 files changed, 14 insertions, 2 deletions

diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp
index a044cca3c9..2fe556096b 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/tools/qstringbuilder.cpp
@@ -108,12 +108,24 @@ void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out
     if (len == -1) {
         if (!a)
             return;
-        while (*a)
+        while (*a && uchar(*a) < 0x80U)
             *out++ = QLatin1Char(*a++);
+        if (!*a)
+            return;
     } else {
-        for (int i = 0; i < len; ++i)
+        int i;
+        for (i = 0; i < len && uchar(a[i]) < 0x80U; ++i)
             *out++ = QLatin1Char(a[i]);
+        if (i == len)
+            return;
+        a += i;
+        len -= i;
     }
+
+    // we need to complement with UTF-8 appending
+    QString tmp = QString::fromUtf8(a, len);
+    memcpy(out, reinterpret_cast<const char *>(tmp.constData()), sizeof(QChar) * tmp.size());
+    out += tmp.size();
 }
 
 QT_END_NAMESPACE