Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev

1 files changed, 4 insertions, 18 deletions

diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index b2832b5fbe..9a40abcfed 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -277,9 +277,9 @@ template <> struct QConcatenable<QStringRef> : private QAbstractConcatenable
     }
 };
 
-template <int N> struct QConcatenable<char[N]> : private QAbstractConcatenable
+template <int N> struct QConcatenable<const char[N]> : private QAbstractConcatenable
 {
-    typedef char type[N];
+    typedef const char type[N];
     typedef QByteArray ConvertTo;
     enum { ExactSize = false };
     static int size(const char[N]) { return N - 1; }
@@ -296,23 +296,9 @@ template <int N> struct QConcatenable<char[N]> : private QAbstractConcatenable
     }
 };
 
-template <int N> struct QConcatenable<const char[N]> : private QAbstractConcatenable
+template <int N> struct QConcatenable<char[N]> : QConcatenable<const char[N]>
 {
-    typedef const char type[N];
-    typedef QByteArray ConvertTo;
-    enum { ExactSize = false };
-    static int size(const char[N]) { return N - 1; }
-#ifndef QT_NO_CAST_FROM_ASCII
-    static inline void QT_ASCII_CAST_WARN appendTo(const char a[N], QChar *&out)
-    {
-        QAbstractConcatenable::convertFromAscii(a, N - 1, out);
-    }
-#endif
-    static inline void appendTo(const char a[N], char *&out)
-    {
-        while (*a)
-            *out++ = *a++;
-    }
+    typedef char type[N];
 };
 
 template <> struct QConcatenable<const char *> : private QAbstractConcatenable