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

Debugger: use requested file and line for pending breakpoints

Browse Source 
Otherwise markers will not be shown. This fixes the visual aspect of
the referenced tasks. Choosing a specific engine if more than one is
running is still not possible.

Task-number: QTCREATORBUG-21361
Task-number: QTCREATORBUG-21330
Change-Id: I5e31adf43ca8a57add83166b307434122498f1e6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
hjk
2018-10-22 16:18:46 +02:00
parent 6dc2da9413
commit e24335e8a6
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1082,17 +1082,7 @@ QVariant BreakpointItem::data(int column, int role) const
break; break;
case BreakpointFileColumn: case BreakpointFileColumn:
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
QString str; const QString str = markerFileName();
if (!m_parameters.fileName.isEmpty())
str = m_parameters.fileName;
if (str.isEmpty()) {
QString s = FileName::fromString(str).fileName();
if (!s.isEmpty())
str = s;
}
// FIXME: better?
//if (params.multiple && str.isEmpty() && !response.fileName.isEmpty())
// str = response.fileName;
if (!str.isEmpty()) if (!str.isEmpty())
return QDir::toNativeSeparators(str); return QDir::toNativeSeparators(str);
return empty; return empty;
@@ -1100,8 +1090,9 @@ QVariant BreakpointItem::data(int column, int role) const
break; break;
case BreakpointLineColumn: case BreakpointLineColumn:
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
if (m_parameters.lineNumber > 0) const int line = markerLineNumber();
return m_parameters.lineNumber; if (line > 0)
return line;
return empty; return empty;
} }
if (role == Qt::UserRole + 1) if (role == Qt::UserRole + 1)
@@ -1830,7 +1821,9 @@ QString BreakpointItem::markerFileName() const
int BreakpointItem::markerLineNumber() const int BreakpointItem::markerLineNumber() const
{ {
return m_parameters.lineNumber; if (m_parameters.lineNumber > 0)
return m_parameters.lineNumber;
return requestedParameters().lineNumber;
} }
const BreakpointParameters &BreakpointItem::requestedParameters() const const BreakpointParameters &BreakpointItem::requestedParameters() const