1 files changed, 56 insertions, 3 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 00d15fd518..b972be68a3 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -39,6 +39,7 @@
 #include "qlist.h"
 #include "qlocale.h"
 #include "qlocale_p.h"
+#include "qlocale_tools_p.h"
 #include "qstringalgorithms_p.h"
 #include "qscopedpointer.h"
 #include "qbytearray_p.h"
@@ -1713,6 +1714,14 @@ QByteArray &QByteArray::prepend(const char *str, int len)
     return *this;
 }
 
+/*! \fn QByteArray &QByteArray::prepend(int count, char ch)
+
+    \overload
+    \since 5.7
+
+    Prepends \a count copies of character \a ch to this byte array.
+*/
+
 /*!
     \overload
 
@@ -1825,6 +1834,17 @@ QByteArray &QByteArray::append(const char *str, int len)
     return *this;
 }
 
+/*! \fn QByteArray &QByteArray::append(int count, char ch)
+
+    \overload
+    \since 5.7
+
+    Appends \a count copies of character \a ch to this byte
+    array and returns a reference to this byte array.
+
+    If \a count is negative or zero nothing is appended to the byte array.
+*/
+
 /*!
     \overload
 
@@ -1941,6 +1961,33 @@ QByteArray &QByteArray::insert(int i, char ch)
     return qbytearray_insert(this, i, &ch, 1);
 }
 
+/*! \fn QByteArray &QByteArray::insert(int i, int count, char ch)
+
+    \overload
+    \since 5.7
+
+    Inserts \a count copies of character \a ch at index position \a i in the
+    byte array.
+
+    If \a i is greater than size(), the array is first extended using resize().
+*/
+
+QByteArray &QByteArray::insert(int i, int count, char ch)
+{
+    if (i < 0 || count <= 0)
+        return *this;
+
+    int oldsize = size();
+    resize(qMax(i, oldsize) + count);
+    char *dst = d->data();
+    if (i > oldsize)
+        ::memset(dst + oldsize, 0x20, i - oldsize);
+    else if (i < oldsize)
+        ::memmove(dst + i + count, dst + i, oldsize - i);
+    ::memset(dst + i, ch, count);
+    return *this;
+}
+
 /*!
     Removes \a len bytes from the array, starting at index position \a
     pos, and returns a reference to the array.
@@ -3648,7 +3695,13 @@ ushort QByteArray::toUShort(bool *ok, int base) const
 
 double QByteArray::toDouble(bool *ok) const
 {
-    return QLocaleData::bytearrayToDouble(nulTerminated().constData(), ok);
+    QByteArray nulled = nulTerminated();
+    bool nonNullOk = false;
+    int processed = 0;
+    double d = asciiToDouble(nulled.constData(), nulled.length(), nonNullOk, processed);
+    if (ok)
+        *ok = nonNullOk;
+    return d;
 }
 
 /*!
@@ -3877,10 +3930,10 @@ QByteArray &QByteArray::setNum(qulonglong n, int base)
 QByteArray &QByteArray::setNum(double n, char f, int prec)
 {
     QLocaleData::DoubleForm form = QLocaleData::DFDecimal;
-    uint flags = 0;
+    uint flags = QLocaleData::ZeroPadExponent;
 
     if (qIsUpper(f))
-        flags = QLocaleData::CapitalEorX;
+        flags |= QLocaleData::CapitalEorX;
     f = qToLower(f);
 
     switch (f) {