diff options
| author | hjk <[email protected]> | 2017-09-27 08:22:02 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2017-09-27 12:16:19 +0000 |
| commit | 895acd23e33408dd967519f1e3a277b0ac28387b (patch) | |
| tree | 9763d50e97d50bbf6f12d0a6231786a0208c31db /src/plugins/debugger/debuggerplugin.cpp | |
| parent | 6f481bd9da32b79fc0aa361c30406b2f4a6af918 (diff) | |
Debugger: Move external terminal into separate RunWorker
Change-Id: Ifb9701f840195ba90db48a0f6fa07b28e0409648
Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 5637e4b18e6..5e378ac20c0 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2878,8 +2878,9 @@ static void createNewDock(QWidget *widget) dockWidget->show(); } -static QString formatStartParameters(const DebuggerRunParameters &sp) +static QString formatStartParameters(const DebuggerRunTool *debugger) { + const DebuggerRunParameters &sp = debugger->runParameters(); QString rc; QTextStream str(&rc); str << "Start parameters: '" << sp.displayName << "' mode: " << sp.startMode @@ -2893,7 +2894,7 @@ static QString formatStartParameters(const DebuggerRunParameters &sp) if (!sp.inferior.executable.isEmpty()) { str << "Executable: " << QDir::toNativeSeparators(sp.inferior.executable) << ' ' << sp.inferior.commandLineArguments; - if (sp.useTerminal) + if (debugger->terminalRunner()) str << " [terminal]"; str << '\n'; if (!sp.inferior.workingDirectory.isEmpty()) @@ -2928,7 +2929,7 @@ void DebuggerPluginPrivate::runControlStarted(DebuggerRunTool *runTool) .arg(runTool->engine()->objectName()) .arg(runTool->runParameters().toolChainAbi.toString()); showStatusMessage(message); - showMessage(formatStartParameters(runTool->runParameters()), LogDebug); + showMessage(formatStartParameters(runTool), LogDebug); showMessage(m_debuggerSettings->dump(), LogDebug); m_snapshotHandler->appendSnapshot(runTool); connectEngine(runTool); |