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

Do not start LocalRunConfiguration when the executable is empty.

Browse Source 
When accidentally pressing 'Debug' on a library project,
the dialog asking for the executable pops up and debugging still
starts although cancel is pressed.

Add dialog title, set flags, and check its return values.

Change-Id: I8518b8af70b12a7059f9ee0e20a9d0b325db1e98
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-12-20 17:03:10 +01:00
parent 689903164a
commit af6e06dfb2
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -717,7 +717,6 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration);
QTC_ASSERT(rc, return sp);
sp.startMode = StartInternal;
sp.environment = rc->environment();
sp.workingDirectory = rc->workingDirectory();
@@ -727,6 +726,9 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
#endif
sp.executable = rc->executable();
if (sp.executable.isEmpty())
return sp;
sp.startMode = StartInternal;
sp.processArgs = rc->commandLineArguments();
sp.toolChainAbi = rc->abi();
if (!sp.toolChainAbi.isValid()) {
@@ -784,6 +786,8 @@ RunControl *DebuggerRunControlFactory::create
{
QTC_ASSERT(mode == Constants::DEBUGMODE || mode == Constants::DEBUGMODE2, return 0);
DebuggerStartParameters sp = localStartParameters(runConfiguration);
if (sp.startMode == NoStartMode)
return 0;
if (mode == Constants::DEBUGMODE2)
sp.breakOnMain = true;
return create(sp, runConfiguration);