Merge remote branch 'origin/2.2'

2011-04-20 11:07:25 +02:00
parent 93f39956f2 0edee47c9f
commit e92988261e
16 changed files with 9482 additions and 1456 deletions
--- a/src/plugins/debugger/cdb/cdbparsehelpers.cpp
+++ b/src/plugins/debugger/cdb/cdbparsehelpers.cpp
@@ -336,8 +336,10 @@ QByteArray cdbWriteMemoryCommand(quint64 addr, const QByteArray &data)
    str.setIntegerBase(16);
    str << "f " << addr << " L" << data.size();
    const int count = data.size();
-    for (int i = 0 ; i < count ; i++ )
-        str << ' ' << int(data.at(i));
+    for (int i = 0 ; i < count ; i++ ) {
+        const unsigned char uc = (unsigned char)data.at(i);
+        str << ' ' << unsigned(uc);
+    }
    return cmd;
 }