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

Merge remote-tracking branch 'origin/2.2'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggersourcepathmappingwidget.cpp
This commit is contained in:
Oswald Buddenhagen
2011-03-23 14:42:31 +01:00
parent f67e9a54c9 b756d30c21
commit 4e2937bf48
64 changed files with 928 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggerengine.cpp
View File

@@ -907,7 +907,7 @@ void DebuggerEngine::notifyInferiorStopOk()
void DebuggerEngine::notifyInferiorSpontaneousStop()
{
showMessage(_("NOTE: INFERIOR SPONTANEOUES STOP"));
showMessage(_("NOTE: INFERIOR SPONTANEOUS STOP"));
QTC_ASSERT(state() == InferiorRunOk, qDebug() << this << state());
setState(InferiorStopOk);
}