Commit 89717f25 authored by hjk's avatar hjk Committed by Oswald Buddenhagen

Fixes: debugger: compile with QT_NO_CAST_TO_ASCII

parent 581cf86b
...@@ -10,7 +10,9 @@ include(../../plugins/texteditor/texteditor.pri) ...@@ -10,7 +10,9 @@ include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/cpptools/cpptools.pri) include(../../plugins/cpptools/cpptools.pri)
include(../../libs/cplusplus/cplusplus.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 QT += gui network script
HEADERS += attachexternaldialog.h \ HEADERS += attachexternaldialog.h \
......
...@@ -509,21 +509,21 @@ void GdbEngine::handleResponse() ...@@ -509,21 +509,21 @@ void GdbEngine::handleResponse()
} }
case '~': { case '~': {
QString data = GdbMi::parseCString(from, to); QByteArray data = GdbMi::parseCString(from, to);
m_pendingConsoleStreamOutput += data; m_pendingConsoleStreamOutput += data;
m_inbuffer = QByteArray(from, to - from); m_inbuffer = QByteArray(from, to - from);
break; break;
} }
case '@': { case '@': {
QString data = GdbMi::parseCString(from, to); QByteArray data = GdbMi::parseCString(from, to);
m_pendingTargetStreamOutput += data; m_pendingTargetStreamOutput += data;
m_inbuffer = QByteArray(from, to - from); m_inbuffer = QByteArray(from, to - from);
break; break;
} }
case '&': { case '&': {
QString data = GdbMi::parseCString(from, to); QByteArray data = GdbMi::parseCString(from, to);
m_pendingLogStreamOutput += data; m_pendingLogStreamOutput += data;
m_inbuffer = QByteArray(from, to - from); m_inbuffer = QByteArray(from, to - from);
// On Windows, the contents seem to depend on the debugger // On Windows, the contents seem to depend on the debugger
...@@ -3157,15 +3157,15 @@ void GdbEngine::runCustomDumper(const WatchData & data0, bool dumpChildren) ...@@ -3157,15 +3157,15 @@ void GdbEngine::runCustomDumper(const WatchData & data0, bool dumpChildren)
addr = "&(" + data.exp + ")"; addr = "&(" + data.exp + ")";
QByteArray params; QByteArray params;
params.append(outertype); params.append(outertype.toUtf8());
params.append('\0'); params.append('\0');
params.append(data.iname); params.append(data.iname.toUtf8());
params.append('\0'); params.append('\0');
params.append(data.exp); params.append(data.exp.toUtf8());
params.append('\0'); params.append('\0');
params.append(inner); params.append(inner.toUtf8());
params.append('\0'); params.append('\0');
params.append(data.iname); params.append(data.iname.toUtf8());
params.append('\0'); params.append('\0');
sendWatchParameters(params); sendWatchParameters(params);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment