debugger: fix recently introduced regression with compiled dumpers.

'+' instead of '+='. Duh.

src/plugins/debugger/gdb/classicgdbengine.cpp

@@ -174,7 +174,8 @@ void GdbEngine::runDebuggingHelperClassic(const WatchData &data0, bool dumpChild
     QByteArray params;
     QList<QByteArray> extraArgs;
     const QtDumperHelper::TypeData td = m_dumperHelper.typeData(data0.type);
-    m_dumperHelper.evaluationParameters(data, td, QtDumperHelper::GdbDebugger, &params, &extraArgs);
+    m_dumperHelper.evaluationParameters(data, td, QtDumperHelper::GdbDebugger,
+        &params, &extraArgs);
 
     //int protocol = (data.iname.startsWith("watch") && data.type == "QImage") ? 3 : 2;
     //int protocol = data.iname.startsWith("watch") ? 3 : 2;
@@ -198,7 +199,7 @@ void GdbEngine::runDebuggingHelperClassic(const WatchData &data0, bool dumpChild
         + ','
         + (dumpChildren ? '1' : '0');
     foreach (const QByteArray &ex, extraArgs)
-        cmd + ',' + ex;
+        cmd += ',' + ex;
     cmd += ')';
 
     postCommand(cmd, WatchUpdate | NonCriticalResponse);

src/plugins/debugger/watchutils.cpp

@@ -1156,10 +1156,8 @@ static inline bool isInteger(const QString &n)
 }
 
 void QtDumperHelper::evaluationParameters(const WatchData &data,
-                                          const TypeData &td,
-                                          Debugger debugger,
-                                          QByteArray *inBuffer,
-                                          QByteArrayList *extraArgsIn) const
+    const TypeData &td, Debugger debugger,
+    QByteArray *inBuffer, QByteArrayList *extraArgsIn) const
 {
     enum { maxExtraArgCount = 4 };
 
@@ -1189,10 +1187,9 @@ void QtDumperHelper::evaluationParameters(const WatchData &data,
         for (int i = 0; i < count; i++)
             extraArgs.push_back(evaluationSizeofTypeExpression(inners.at(i), debugger));
     }
-    int extraArgCount = extraArgs.size();
+
     // Pad with zeros
-    const int extraPad = maxExtraArgCount - extraArgCount;
-    for (int i = 0; i < extraPad; i++)
+    while (extraArgs.size() < maxExtraArgCount)
         extraArgs.push_back("0");
 
     // in rare cases we need more or less: