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

Debugger: Fix core dump with project from command-line

Browse Source 
Change-Id: I223dc3c00aa7d4b2cda743a9292272387177ed93
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2017-07-05 18:07:03 +03:00
committed by Orgad Shaneh
parent 4832f75d53
commit af98652215
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,7 +278,12 @@ static bool fixupParameters(DebuggerRunParameters &rp, RunControl *runControl, Q
// Extract as much as possible from available RunConfiguration.
if (runConfig->runnable().is<StandardRunnable>()) {
// FIXME: Needed for core dump which stores the executable in inferior, but not in runConfig
// executable.
const QString prevExecutable = rp.inferior.executable;
rp.inferior = runConfig->runnable().as<StandardRunnable>();
if (rp.inferior.executable.isEmpty())
rp.inferior.executable = prevExecutable;
rp.useTerminal = rp.inferior.runMode == ApplicationLauncher::Console;
// Normalize to work around QTBUG-17529 (QtDeclarative fails with 'File name case mismatch'...)
rp.inferior.workingDirectory = FileUtils::normalizePathName(rp.inferior.workingDirectory);
@@ -675,6 +680,8 @@ RunConfiguration *dummyRunConfigForKit(ProjectExplorer::Kit *kit)
Target *target = nullptr;
if (project) {
target = project->target(kit);
if (!target)
target = project->createTarget(kit);
} else {
project = new DummyProject;
target = project->createTarget(kit);