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

Debugger: Refactor run control termination.

Browse Source 
Fix breakage introduced by the new asynchronous stop() methods
of the debugger run controls. Allow for RunControl::stop() to
be asynchronous by introducing a return enumeration indicating
that. Introduce additional method aboutToStop() asking user
to quit (tie that to the RunControl instead of having to hack
the behaviour elsewhere).
If asynchronous stop is detected, terminate the ProjectExplorer
asynchronously.
This makes the behaviour consistent across switching sessions/
closing outputwindow tabs and quitting Qt Creator.

Reviewed-by: dt
Rubber-stamped-by: hjk
This commit is contained in:
Friedemann Kleint
2010-08-20 14:19:25 +02:00
parent fa68a545a8
commit 6840c1d198
22 changed files with 376 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -392,10 +392,11 @@ void S60DeviceRunControl::start()
startLaunching();
}
void S60DeviceRunControl::stop()
RunControl::StopResult S60DeviceRunControl::stop()
{
if (m_launcher)
m_launcher->terminate();
return AsynchronousStop;
}
bool S60DeviceRunControl::isRunning() const
@@ -660,15 +661,20 @@ S60DeviceDebugRunControl::~S60DeviceDebugRunControl()
// FIXME: Needed? m_debuggerRunControl->deleteLater();
}
void S60DeviceDebugRunControl::stop()
bool S60DeviceDebugRunControl::aboutToStop() const
{
QTC_ASSERT(m_debuggerRunControl, return)
if (m_debuggerRunControl->state() == Debugger::DebuggerNotReady)
m_debuggerRunControl->stop();
return m_debuggerRunControl ? m_debuggerRunControl->aboutToStop() : true;
}
RunControl::StopResult S60DeviceDebugRunControl::stop()
{
QTC_ASSERT(m_debuggerRunControl, return StoppedSynchronously)
if (m_debugProgress)
m_debugProgress->reportCanceled();
delete m_debugProgress;
m_debugProgress = 0;
return m_debuggerRunControl->stop();
}
bool S60DeviceDebugRunControl::isRunning() const