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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggermainwindow.cpp
	src/plugins/qbsprojectmanager/qbsbuildstep.cpp
	src/plugins/winrt/winrtdevicefactory.cpp
	tests/unit/unittest/gtest-creator-printing.cpp
	tests/unit/unittest/gtest-creator-printing.h
	tests/unit/unittest/unittest.pro

Change-Id: Ie9b80b87a8a4fa81baf72a2daa7919b21371c15e
This commit is contained in:
Eike Ziller
2018-11-06 09:20:00 +01:00
parent 9d296cf1f1 e18cbad285
commit 1473bc5891
229 changed files with 5356 additions and 2822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1082,17 +1082,7 @@ QVariant BreakpointItem::data(int column, int role) const
break;
case BreakpointFileColumn:
if (role == Qt::DisplayRole) {
QString str;
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;
const QString str = markerFileName();
if (!str.isEmpty())
return QDir::toNativeSeparators(str);
return empty;
@@ -1100,8 +1090,9 @@ QVariant BreakpointItem::data(int column, int role) const
break;
case BreakpointLineColumn:
if (role == Qt::DisplayRole) {
if (m_parameters.lineNumber > 0)
return m_parameters.lineNumber;
const int line = markerLineNumber();
if (line > 0)
return line;
return empty;
}
if (role == Qt::UserRole + 1)
@@ -1426,8 +1417,6 @@ void BreakHandler::handleAlienBreakpoint(const QString &responseId, const Breakp
SubBreakpoint BreakpointItem::findOrCreateSubBreakpoint(const QString &responseId)
{
const QString minorPart = responseId.section('.', 1);
SubBreakpoint loc = findFirstLevelChild([&](const SubBreakpoint &l) {
return l->responseId == responseId;
});
@@ -1830,7 +1819,9 @@ QString BreakpointItem::markerFileName() 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