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

Debugger: Fix initialization of StartParameters::useTerminal

Browse Source 
Change-Id: I8b03b02323c6c4d9d714a6cc0ebc7ee40c0abf92
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2016-03-22 13:11:01 +01:00
parent 3cf5f29719
commit 903e40a91d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,14 +340,16 @@ void DebuggerRunControlCreator::enrich(const RunConfiguration *runConfig, const
if (!m_kit && m_target)
m_kit = m_target->kit();
// Make sure we have something sensible to start with.
m_rp.inferior.runMode == ApplicationLauncher::Console;
m_rp.useTerminal = false;
// Extract as much as possible from available RunConfiguration.
if (m_runConfig && m_runConfig->runnable().is<StandardRunnable>()) {
auto runnable = m_runConfig->runnable().as<StandardRunnable>();
m_rp.inferior.executable = runnable.executable;
m_rp.inferior.commandLineArguments = runnable.commandLineArguments;
m_rp.useTerminal = runnable.runMode == ApplicationLauncher::Console;
m_rp.inferior = m_runConfig->runnable().as<StandardRunnable>();
m_rp.useTerminal = m_rp.inferior.runMode == ApplicationLauncher::Console;
// Normalize to work around QTBUG-17529 (QtDeclarative fails with 'File name case mismatch'...)
m_rp.inferior.workingDirectory = FileUtils::normalizePathName(runnable.workingDirectory);
m_rp.inferior.workingDirectory = FileUtils::normalizePathName(m_rp.inferior.workingDirectory);
}
// We might get an executable from a local PID.