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

Merge remote branch 'origin/1.3'

Browse Source
This commit is contained in:
con
2010-01-05 10:58:06 +01:00
parent 8929bb27ee cf8b5704d0
commit 7185e42b25
12 changed files with 318 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/gdb/remotegdbadapter.cpp
View File

@@ -195,7 +195,7 @@ void RemoteGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
CB(handleTargetRemote));
} else {
QString msg = tr("Starting remote executable failed:\n");
msg += __(response.data.findChild("msg").data());
msg += QString::fromLocal8Bit(response.data.findChild("msg").data());
emit inferiorStartFailed(msg);
}
}
@@ -211,7 +211,8 @@ void RemoteGdbAdapter::handleTargetRemote(const GdbResponse &record)
emit inferiorPrepared();
} else {
// 16^error,msg="hd:5555: Connection timed out."
QString msg = msgConnectRemoteServerFailed(__(record.data.findChild("msg").data()));
QString msg = msgConnectRemoteServerFailed(
QString::fromLocal8Bit(record.data.findChild("msg").data()));
emit inferiorStartFailed(msg);
}
}