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

Fix compilation.

Browse Source 
There is no + operator that takes a QByteArray and a QString (or vice
versa).

Change-Id: I8734923cbbb0360bc20f9775d57801803782716f
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Erik Verbruggen
2016-06-09 11:42:37 +02:00
parent a9066f30f0
commit ae7e03d51f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -2581,7 +2581,7 @@ void GdbEngine::handleBreakInsert1(const DebuggerResponse &response, Breakpoint
const QString fileName = bp.fileName();
const int lineNumber = bp.lineNumber();
DebuggerCommand cmd("trace \"" + GdbMi::escapeCString(fileName) + "\":"
+ QByteArray::number(lineNumber),
+ QString::number(lineNumber),
NeedsStop | RebuildBreakpointModel);
runCommand(cmd);
} else {
@@ -2822,7 +2822,7 @@ void GdbEngine::changeBreakpoint(Breakpoint bp)
cmd.function = "condition " + bpnr + ' ' + data.condition;
cmd.callback = [this, bp](const DebuggerResponse &r) { handleBreakCondition(r, bp); };
} else if (data.ignoreCount != response.ignoreCount) {
cmd.function = "ignore " + bpnr + ' ' + QByteArray::number(data.ignoreCount);
cmd.function = "ignore " + bpnr + ' ' + QString::number(data.ignoreCount);
cmd.callback = [this, bp](const DebuggerResponse &r) { handleBreakIgnore(r, bp); };
} else if (!data.enabled && response.enabled) {
cmd.function = "-break-disable " + bpnr;