From 89717f25f92db5221777d5415eba09708065b0bf Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 19 Feb 2009 10:46:47 +0100
Subject: [PATCH] Fixes: debugger: compile with QT_NO_CAST_TO_ASCII
---
src/plugins/debugger/debugger.pro | 4 +++-
src/plugins/debugger/gdbengine.cpp | 16 ++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 0578a52720b..b3204bce625 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -10,7 +10,9 @@ include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/cpptools/cpptools.pri)
include(../../libs/cplusplus/cplusplus.pri)
-# DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
+# DEFINES += QT_NO_CAST_FROM_ASCII
+DEFINES += QT_NO_CAST_TO_ASCII
+
QT += gui network script
HEADERS += attachexternaldialog.h \
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp
index 462c93a4ff8..a91ba2454d0 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdbengine.cpp
@@ -509,21 +509,21 @@ void GdbEngine::handleResponse()
}
case '~': {
- QString data = GdbMi::parseCString(from, to);
+ QByteArray data = GdbMi::parseCString(from, to);
m_pendingConsoleStreamOutput += data;
m_inbuffer = QByteArray(from, to - from);
break;
}
case '@': {
- QString data = GdbMi::parseCString(from, to);
+ QByteArray data = GdbMi::parseCString(from, to);
m_pendingTargetStreamOutput += data;
m_inbuffer = QByteArray(from, to - from);
break;
}
case '&': {
- QString data = GdbMi::parseCString(from, to);
+ QByteArray data = GdbMi::parseCString(from, to);
m_pendingLogStreamOutput += data;
m_inbuffer = QByteArray(from, to - from);
// On Windows, the contents seem to depend on the debugger
@@ -3157,15 +3157,15 @@ void GdbEngine::runCustomDumper(const WatchData & data0, bool dumpChildren)
addr = "&(" + data.exp + ")";
QByteArray params;
- params.append(outertype);
+ params.append(outertype.toUtf8());
params.append('\0');
- params.append(data.iname);
+ params.append(data.iname.toUtf8());
params.append('\0');
- params.append(data.exp);
+ params.append(data.exp.toUtf8());
params.append('\0');
- params.append(inner);
+ params.append(inner.toUtf8());
params.append('\0');
- params.append(data.iname);
+ params.append(data.iname.toUtf8());
params.append('\0');
sendWatchParameters(params);
--
GitLab