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:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: I87f47cecbb924064296a002fd9446a0627acad8e
This commit is contained in:
Eike Ziller
2018-12-12 09:44:13 +01:00
parent 1a2a278eec 5cd4a73aca
commit 9084ca73df
27 changed files with 214 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -2488,15 +2488,17 @@ void GdbEngine::updateBreakpoint(const Breakpoint &bp)
QTC_ASSERT(state2 == BreakpointUpdateProceeding, qDebug() << state2);
DebuggerCommand cmd;
if (!bp->isPending() && requested.threadSpec != bp->threadSpec()) {
// The only way to change this seems to be to re-set the bp completely.
cmd.function = "-break-delete " + bpnr;
cmd.callback = [this, bp](const DebuggerResponse &r) { handleBreakThreadSpec(r, bp); };
} else if (!bp->isPending() && requested.lineNumber != bp->lineNumber()) {
// The only way to change this seems to be to re-set the bp completely.
cmd.function = "-break-delete " + bpnr;
cmd.callback = [this, bp](const DebuggerResponse &r) { handleBreakLineNumber(r, bp); };
} else if (requested.command != bp->command()) {
// FIXME: See QTCREATORBUG-21611, QTCREATORBUG-21616
// if (!bp->isPending() && requested.threadSpec != bp->threadSpec()) {
// // The only way to change this seems to be to re-set the bp completely.
// cmd.function = "-break-delete " + bpnr;
// cmd.callback = [this, bp](const DebuggerResponse &r) { handleBreakThreadSpec(r, bp); };
// } else if (!bp->isPending() && requested.lineNumber != bp->lineNumber()) {
// // The only way to change this seems to be to re-set the bp completely.
// cmd.function = "-break-delete " + bpnr;
// cmd.callback = [this, bp](const DebuggerResponse &r) { handleBreakLineNumber(r, bp); };
// } else if
if (requested.command != bp->command()) {
cmd.function = "-break-commands " + bpnr;
for (QString command : requested.command.split('\n')) {
if (!command.isEmpty()) {