diff options
| author | hjk <hjk@qt.io> | 2019-10-31 16:18:24 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-11-01 08:49:39 +0000 |
| commit | 67ba6a5b9acfcd1543bda6c8e8c5ca747ca4e586 (patch) | |
| tree | 8a02ffddd0da41e947f6c2101df65e04720483bd | |
| parent | 97788c457eed2bb7e97eadf87900f9bef9329e78 (diff) | |
| download | qt-creator-67ba6a5b9acfcd1543bda6c8e8c5ca747ca4e586.tar.gz | |
Debugger: Fix conditional operator with identical true and false expressions
Change-Id: I1f85eed5355cd01590bc8cc0082f154e215a9ac3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| -rw-r--r-- | src/plugins/debugger/breakhandler.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 90dd8f3c86..6015f29dec 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -1065,6 +1065,7 @@ QVariant BreakpointItem::data(int column, int role) const if (role == Qt::DisplayRole) { if (!m_parameters.functionName.isEmpty()) return simplifyType(m_parameters.functionName); + if (m_parameters.type == BreakpointAtMain || m_parameters.type == BreakpointAtThrow || m_parameters.type == BreakpointAtCatch @@ -1073,15 +1074,13 @@ QVariant BreakpointItem::data(int column, int role) const //|| m_response.type == BreakpointAtVFork || m_parameters.type == BreakpointAtSysCall) return typeToString(m_parameters.type); - if (m_parameters.type == WatchpointAtAddress) { - quint64 address = m_parameters.address ? m_parameters.address : m_parameters.address; - return BreakHandler::tr("Data at 0x%1").arg(address, 0, 16); - } - if (m_parameters.type == WatchpointAtExpression) { - QString expression = !m_parameters.expression.isEmpty() - ? m_parameters.expression : m_parameters.expression; - return BreakHandler::tr("Data at %1").arg(expression); - } + + if (m_parameters.type == WatchpointAtAddress) + return BreakHandler::tr("Data at 0x%1").arg(m_parameters.address, 0, 16); + + if (m_parameters.type == WatchpointAtExpression) + return BreakHandler::tr("Data at %1").arg(m_parameters.expression); + return empty; } break; |