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

2
src/plugins/debugger/lldb/lldbengine.cpp
View File

@@ -123,7 +123,7 @@ void LldbEngine::runCommand(const DebuggerCommand &cmd)
const int tok = ++currentToken(); const int tok = ++currentToken();
DebuggerCommand command = cmd; DebuggerCommand command = cmd;
command.arg("token", tok); command.arg("token", tok);
QByteArray token = QByteArray::number(tok); QString token = QString::number(tok);
QString function = command.function + "(" + command.argsToPython() + ")"; QString function = command.function + "(" + command.argsToPython() + ")";
showMessage(token + function + '\n', LogInput); showMessage(token + function + '\n', LogInput);
m_commandForToken[currentToken()] = command; m_commandForToken[currentToken()] = command;

2
src/plugins/debugger/qml/qmlinspectoragent.cpp
View File

@@ -391,7 +391,7 @@ void QmlInspectorAgent::onValueChanged(int debugId, const QByteArray &propertyNa
const QVariant &value) const QVariant &value)
{ {
const QString iname = m_debugIdToIname.value(debugId) + const QString iname = m_debugIdToIname.value(debugId) +
".[properties]." + propertyName; ".[properties]." + QString::fromLatin1(propertyName);
WatchHandler *watchHandler = m_qmlEngine->watchHandler(); WatchHandler *watchHandler = m_qmlEngine->watchHandler();
qCDebug(qmlInspectorLog) qCDebug(qmlInspectorLog)
<< __FUNCTION__ << '(' << debugId << ')' << iname << __FUNCTION__ << '(' << debugId << ')' << iname

2
src/plugins/debugger/watchdata.cpp
View File

@@ -631,7 +631,7 @@ QString WatchItem::internalName() const
{ {
if (arrayIndex >= 0) { if (arrayIndex >= 0) {
if (const WatchItem *p = parentItem()) if (const WatchItem *p = parentItem())
return p->iname + '.' + QByteArray::number(arrayIndex); return p->iname + '.' + QString::number(arrayIndex);
} }
return iname; return iname;
} }