Merge remote branch 'origin/1.3'

2010-01-05 10:58:06 +01:00
parent 8929bb27ee cf8b5704d0
commit 7185e42b25
12 changed files with 318 additions and 377 deletions
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -1705,7 +1705,7 @@ void TrkGdbAdapter::handleTargetRemote(const GdbResponse &record)
        emit inferiorPrepared();
    } else {
        QString msg = tr("Connecting to TRK server adapter failed:\n")
-            + _(record.data.findChild("msg").data());
+            + QString::fromLocal8Bit(record.data.findChild("msg").data());
        emit inferiorStartFailed(msg);
    }
 }