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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
This commit is contained in:
con
2011-04-01 09:53:09 +02:00
parent 12fd1dbb70 eb03bd1a93
commit 1c2da511b9
140 changed files with 1139 additions and 2743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/gdb/remotegdbprocess.cpp
View File

@@ -193,12 +193,12 @@ void RemoteGdbProcess::handleGdbFinished(int exitStatus)
switch (exitStatus) {
case Utils::SshRemoteProcess::FailedToStart:
m_error = tr("Remote gdb failed to start.");
m_error = tr("Remote GDB failed to start.");
setState(Inactive);
emit startFailed();
break;
case Utils::SshRemoteProcess::KilledBySignal:
emitErrorExit(tr("Remote gdb crashed."));
emitErrorExit(tr("Remote GDB crashed."));
break;
case Utils::SshRemoteProcess::ExitedNormally:
const int exitCode = m_gdbProc->exitCode();