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

Debugger: Inline/Remove rarely used argument handling

Browse Source 
Change-Id: Ibe97f3e406a4fc01569aa8e1325531ce4764adca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-08-22 12:50:55 +02:00
parent ee23dcba23
commit e3184cfd6d
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -486,20 +486,6 @@ void DebuggerRunTool::setCoreFileName(const QString &coreFile, bool isSnapshot)
m_runParameters.isSnapshot = isSnapshot;
}
void DebuggerRunTool::appendInferiorCommandLineArgument(const QString &arg)
{
QtcProcess::addArg(&m_runParameters.inferior.commandLineArguments, arg,
device() ? device()->osType() : HostOsInfo::hostOs());
}
void DebuggerRunTool::prependInferiorCommandLineArgument(const QString &arg)
{
if (!m_runParameters.inferior.commandLineArguments.isEmpty())
m_runParameters.inferior.commandLineArguments.prepend(' ');
m_runParameters.inferior.commandLineArguments.prepend(
QtcProcess::quoteArg(arg, device() ? device()->osType() : HostOsInfo::hostOs()));
}
void DebuggerRunTool::addQmlServerInferiorCommandLineArgumentIfNeeded()
{
d->addQmlServerInferiorCommandLineArgumentIfNeeded = true;
@@ -531,12 +517,16 @@ void DebuggerRunTool::start()
if (d->addQmlServerInferiorCommandLineArgumentIfNeeded
&& m_runParameters.isQmlDebugging
&& m_runParameters.isCppDebugging()) {
using namespace QmlDebug;
int qmlServerPort = m_runParameters.qmlServer.port();
QTC_ASSERT(qmlServerPort > 0, reportFailure(); return);
QString mode = QString("port:%1").arg(qmlServerPort);
QString qmlServerArg = qmlDebugCommandLineArguments(QmlDebuggerServices, mode, true);
prependInferiorCommandLineArgument(qmlServerArg);
CommandLine cmd{m_runParameters.inferior.executable};
cmd.addArg(qmlDebugCommandLineArguments(QmlDebug::QmlDebuggerServices, mode, true));
cmd.addArgs(m_runParameters.inferior.commandLineArguments, CommandLine::Raw);
m_runParameters.inferior.setCommandLine(cmd);
}
}