From 89302436cbd3c02cad3e73da9b20159a78bd870b Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 30 Mar 2017 21:26:31 +0200
Subject: QStringBuilder: add support for (non-const) char*

There's support for const char[] and char[], so it seems this was
simply forgotten.

[ChangeLog][QtCore][QStringBuilder] Added support for (non-const) char*.

Change-Id: I4b5d9039632da7721256579b7741816027321a7e
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/corelib/tools/qstringbuilder.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 9a40abcfed..5c6d990314 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -303,7 +303,7 @@ template <int N> struct QConcatenable<char[N]> : QConcatenable<const char[N]>
 
 template <> struct QConcatenable<const char *> : private QAbstractConcatenable
 {
-    typedef char const *type;
+    typedef const char *type;
     typedef QByteArray ConvertTo;
     enum { ExactSize = false };
     static int size(const char *a) { return qstrlen(a); }
@@ -320,6 +320,11 @@ template <> struct QConcatenable<const char *> : private QAbstractConcatenable
     }
 };
 
+template <> struct QConcatenable<char *> : QConcatenable<const char*>
+{
+    typedef char *type;
+};
+
 template <> struct QConcatenable<QByteArray> : private QAbstractConcatenable
 {
     typedef QByteArray type;
-- 
cgit v1.2.3