From 5fcdb73e4db72efaa191a2b058fd049f4d69b0a9 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 6 Sep 2013 16:23:54 +0200 Subject: [PATCH] Valgrind: Do not ignore/overwrite tool options ...otherwise all the options the user has set are in vain. Change-Id: I6f344aafa848e3216a8ebf98e6fdddac26af4749 Reviewed-by: hjk --- src/plugins/valgrind/memcheck/memcheckrunner.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.cpp b/src/plugins/valgrind/memcheck/memcheckrunner.cpp index 8920ec09af7..cb3608f01cd 100644 --- a/src/plugins/valgrind/memcheck/memcheckrunner.cpp +++ b/src/plugins/valgrind/memcheck/memcheckrunner.cpp @@ -181,12 +181,12 @@ bool MemcheckRunner::start() const quint16 logPortNumber = d->logServer.serverPort(); connect(&d->logServer, SIGNAL(newConnection()), SLOT(logSocketConnected())); - QStringList memcheckArguments; - memcheckArguments << QLatin1String("--xml=yes") + QStringList memcheckLogArguments; + memcheckLogArguments << QLatin1String("--xml=yes") << QString::fromLatin1("--xml-socket=%1:%2").arg(ip).arg(xmlPortNumber) << QLatin1String("--child-silent-after-fork=yes") << QString::fromLatin1("--log-socket=%1:%2").arg(ip).arg(logPortNumber); - setValgrindArguments(memcheckArguments); + setValgrindArguments(memcheckLogArguments + valgrindArguments()); return ValgrindRunner::start(); }