feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Valgrind: Do not ignore/overwrite tool options

Browse Source 
...otherwise all the options the user has set are in vain.

Change-Id: I6f344aafa848e3216a8ebf98e6fdddac26af4749
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Nikolai Kosjar
2013-09-06 16:23:54 +02:00
committed by hjk
parent fc86c43fd6
commit 5fcdb73e4d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/valgrind/memcheck/memcheckrunner.cpp
View File

@@ -181,12 +181,12 @@ bool MemcheckRunner::start()
const quint16 logPortNumber = d->logServer.serverPort(); const quint16 logPortNumber = d->logServer.serverPort();
connect(&d->logServer, SIGNAL(newConnection()), SLOT(logSocketConnected())); connect(&d->logServer, SIGNAL(newConnection()), SLOT(logSocketConnected()));
QStringList memcheckArguments; QStringList memcheckLogArguments;
memcheckArguments << QLatin1String("--xml=yes") memcheckLogArguments << QLatin1String("--xml=yes")
<< QString::fromLatin1("--xml-socket=%1:%2").arg(ip).arg(xmlPortNumber) << QString::fromLatin1("--xml-socket=%1:%2").arg(ip).arg(xmlPortNumber)
<< QLatin1String("--child-silent-after-fork=yes") << QLatin1String("--child-silent-after-fork=yes")
<< QString::fromLatin1("--log-socket=%1:%2").arg(ip).arg(logPortNumber); << QString::fromLatin1("--log-socket=%1:%2").arg(ip).arg(logPortNumber);
setValgrindArguments(memcheckArguments); setValgrindArguments(memcheckLogArguments + valgrindArguments());
return ValgrindRunner::start(); return ValgrindRunner::start();
} }