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

Merge remote-tracking branch 'origin/4.10' into 4.11

Browse Source 
Conflicts:
	src/libs/utils/fancymainwindow.cpp
	src/plugins/projectexplorer/msvctoolchain.cpp

Change-Id: I7aaeeb4f96c95fefd4944c083c1ddf9a19cd81d6
This commit is contained in:
Eike Ziller
2019-10-28 11:43:06 +01:00
parent fea693d9f9 189ab38641
commit a546e3a9cc
8 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,31 +169,24 @@ public:
// running, as this can be triggered by moving the breakpoint to
// the next line that generated code.
m_gbp->m_params.lineNumber = lineNumber;
m_gbp->updateMarker();
m_gbp->update();
m_gbp->updateLineNumber(lineNumber);
}
void updateFileName(const FilePath &fileName) final
{
TextMark::updateFileName(fileName);
QTC_ASSERT(m_gbp, return);
m_gbp->m_params.fileName = fileName.toString();
m_gbp->update();
m_gbp->updateFileName(fileName);
}
bool isDraggable() const final { return true; }
void dragToLine(int line) final
{
TextMark::move(line);
QTC_ASSERT(m_gbp, return);
QTC_ASSERT(BreakpointManager::globalBreakpoints().contains(m_gbp), return);
BreakpointParameters params = m_gbp->m_params;
params.lineNumber = line;
GlobalBreakpoint gbp = m_gbp;
m_gbp = GlobalBreakpoint();
gbp->deleteBreakpoint();
m_gbp = BreakpointManager::createBreakpoint(params);
m_gbp->updateLineNumber(line);
}
bool isClickable() const final { return true; }
@@ -2273,6 +2266,23 @@ void GlobalBreakpointItem::removeBreakpointFromModel()
theBreakpointManager->destroyItem(this);
}
void GlobalBreakpointItem::updateLineNumber(int lineNumber)
{
if (m_params.lineNumber == lineNumber)
return;
m_params.lineNumber = lineNumber;
update();
}
void GlobalBreakpointItem::updateFileName(const FilePath &fileName)
{
const QString &file = fileName.toString();
if (m_params.fileName == file)
return;
m_params.fileName = file;
update();
}
QString GlobalBreakpointItem::markerFileName() const
{
// Some heuristics to find a "good" file name.
@@ -2308,11 +2318,14 @@ void GlobalBreakpointItem::updateMarker()
const FilePath file = FilePath::fromString(m_params.fileName);
const int line = m_params.lineNumber;
if (m_marker && (file != m_marker->fileName() || line != m_marker->lineNumber()))
destroyMarker();
if (!m_marker && !file.isEmpty() && line > 0)
if (m_marker) {
if (file != m_marker->fileName())
m_marker->updateFileName(file);
if (line != m_marker->lineNumber())
m_marker->move(line);
} else if (!file.isEmpty() && line > 0) {
m_marker = new GlobalBreakpointMarker(this, file, line);
}
if (m_marker)
m_marker->setToolTip(toolTip());