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

Debugger: Fix conditional operator with identical true and false expressions

Browse Source 
Change-Id: I1f85eed5355cd01590bc8cc0082f154e215a9ac3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
hjk
2019-10-31 16:18:24 +01:00
parent 97788c457e
commit 67ba6a5b9a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/breakhandler.cpp
View File

@@ -1065,6 +1065,7 @@ QVariant BreakpointItem::data(int column, int role) const
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
if (!m_parameters.functionName.isEmpty()) if (!m_parameters.functionName.isEmpty())
return simplifyType(m_parameters.functionName); return simplifyType(m_parameters.functionName);
if (m_parameters.type == BreakpointAtMain if (m_parameters.type == BreakpointAtMain
|| m_parameters.type == BreakpointAtThrow || m_parameters.type == BreakpointAtThrow
|| m_parameters.type == BreakpointAtCatch || m_parameters.type == BreakpointAtCatch
@@ -1073,15 +1074,13 @@ QVariant BreakpointItem::data(int column, int role) const
//|| m_response.type == BreakpointAtVFork //|| m_response.type == BreakpointAtVFork
|| m_parameters.type == BreakpointAtSysCall) || m_parameters.type == BreakpointAtSysCall)
return typeToString(m_parameters.type); return typeToString(m_parameters.type);
if (m_parameters.type == WatchpointAtAddress) {
quint64 address = m_parameters.address ? m_parameters.address : m_parameters.address; if (m_parameters.type == WatchpointAtAddress)
return BreakHandler::tr("Data at 0x%1").arg(address, 0, 16); return BreakHandler::tr("Data at 0x%1").arg(m_parameters.address, 0, 16);
}
if (m_parameters.type == WatchpointAtExpression) { if (m_parameters.type == WatchpointAtExpression)
QString expression = !m_parameters.expression.isEmpty() return BreakHandler::tr("Data at %1").arg(m_parameters.expression);
? m_parameters.expression : m_parameters.expression;
return BreakHandler::tr("Data at %1").arg(expression);
}
return empty; return empty;
} }
break; break;