Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I37609a137247e3203d09942e187ec880c6eba884

1 files changed, 7 insertions, 0 deletions

diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index 1b325b5..673b681 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -431,9 +431,16 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb
                 if (!parameterType.contains("::") && namespaceForType.contains(parameterType))
                     parameterType.prepend(namespaceForType.value(parameterType) + "::");
 
+                QByteArray arraySpec; // transform array method signature "foo(int[4])" ->"foo(int p[4])"
+                const int arrayPos = parameterType.lastIndexOf('[');
+                if (arrayPos != -1) {
+                    arraySpec = parameterType.right(parameterType.size() - arrayPos);
+                    parameterType.truncate(arrayPos);
+                }
                 slotNamedSignature += constRefify(parameterType);
                 slotNamedSignature += ' ';
                 slotNamedSignature += parameterSplit.at(i);
+                slotNamedSignature += arraySpec;
                 if (defaultArguments >= signatureSplit.count() - i) {
                     slotNamedSignature += " = ";
                     slotNamedSignature += parameterType + "()";