forked from qt-creator/qt-creator
Fix compilation.
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:
@@ -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;
|
||||
|
||||
@@ -123,7 +123,7 @@ void LldbEngine::runCommand(const DebuggerCommand &cmd)
|
||||
const int tok = ++currentToken();
|
||||
DebuggerCommand command = cmd;
|
||||
command.arg("token", tok);
|
||||
QByteArray token = QByteArray::number(tok);
|
||||
QString token = QString::number(tok);
|
||||
QString function = command.function + "(" + command.argsToPython() + ")";
|
||||
showMessage(token + function + '\n', LogInput);
|
||||
m_commandForToken[currentToken()] = command;
|
||||
|
||||
@@ -391,7 +391,7 @@ void QmlInspectorAgent::onValueChanged(int debugId, const QByteArray &propertyNa
|
||||
const QVariant &value)
|
||||
{
|
||||
const QString iname = m_debugIdToIname.value(debugId) +
|
||||
".[properties]." + propertyName;
|
||||
".[properties]." + QString::fromLatin1(propertyName);
|
||||
WatchHandler *watchHandler = m_qmlEngine->watchHandler();
|
||||
qCDebug(qmlInspectorLog)
|
||||
<< __FUNCTION__ << '(' << debugId << ')' << iname
|
||||
|
||||
@@ -631,7 +631,7 @@ QString WatchItem::internalName() const
|
||||
{
|
||||
if (arrayIndex >= 0) {
|
||||
if (const WatchItem *p = parentItem())
|
||||
return p->iname + '.' + QByteArray::number(arrayIndex);
|
||||
return p->iname + '.' + QString::number(arrayIndex);
|
||||
}
|
||||
return iname;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user