Partitial revert of d7af85a0.

broke at least cdb.

Reviewed-By: hjk <qtc-committer@nokia.com>

share/qtcreator/gdbmacros/gdbmacros.cpp

@@ -2915,6 +2915,7 @@ void *qDumpObjectData440(
         d.iname     = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
         d.exp       = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
         d.innertype = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
+        d.iname     = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
 
         handleProtocolVersion2and3(d);
     }

src/plugins/debugger/watchutils.cpp

@@ -1270,6 +1270,8 @@ void QtDumperHelper::evaluationParameters(const WatchData &data,
     inBuffer->append('\0');
     inBuffer->append(inner.toUtf8());
     inBuffer->append('\0');
+    inBuffer->append(data.iname.toUtf8());
+    inBuffer->append('\0');
 
     if (debug)
         qDebug() << '\n' << Q_FUNC_INFO << '\n' << data.toString() << "\n-->" << outertype << td.type << extraArgs;