Merge remote-tracking branch 'origin/4.8'

Change-Id: Ia8bf92c8effdee0e1085730cb975ff88c8ad85fc
This commit is contained in:
Orgad Shaneh
2018-11-20 19:13:13 +02:00
80 changed files with 1545 additions and 1057 deletions

View File

@@ -1769,25 +1769,25 @@ static QString msgNoGdbBinaryForToolChain(const Abi &tc)
bool GdbEngine::hasCapability(unsigned cap) const
{
if (runParameters().startMode == AttachCore) {
return cap & (AutoDerefPointersCapability
| DisassemblerCapability
| RegisterCapability
| ShowMemoryCapability
| CreateFullBacktraceCapability
| AddWatcherCapability
| ShowModuleSymbolsCapability
| ShowModuleSectionsCapability
| WatchComplexExpressionsCapability
| MemoryAddressCapability
| AdditionalQmlStackCapability);
if (cap & (AutoDerefPointersCapability
| DisassemblerCapability
| RegisterCapability
| ShowMemoryCapability
| CreateFullBacktraceCapability
| AddWatcherCapability
| ShowModuleSymbolsCapability
| ShowModuleSectionsCapability
| OperateByInstructionCapability
| WatchComplexExpressionsCapability
| MemoryAddressCapability
| AdditionalQmlStackCapability)) {
return true;
}
return cap & (AutoDerefPointersCapability
| DisassemblerCapability
| RegisterCapability
| ShowMemoryCapability
| JumpToLineCapability
if (runParameters().startMode == AttachCore)
return false;
return cap & (JumpToLineCapability
| ReloadModuleCapability
| ReloadModuleSymbolsCapability
| BreakOnThrowAndCatchCapability
@@ -1795,21 +1795,14 @@ bool GdbEngine::hasCapability(unsigned cap) const
| BreakIndividualLocationsCapability
| TracePointCapability
| ReturnFromFunctionCapability
| CreateFullBacktraceCapability
| WatchpointByAddressCapability
| WatchpointByExpressionCapability
| AddWatcherCapability
| AddWatcherWhileRunningCapability
| WatchWidgetsCapability
| ShowModuleSymbolsCapability
| ShowModuleSectionsCapability
| CatchCapability
| OperateByInstructionCapability
| RunToLineCapability
| WatchComplexExpressionsCapability
| MemoryAddressCapability
| AdditionalQmlStackCapability
| NativeMixedCapability
| ResetInferiorCapability
| SnapshotCapability
| ReverseSteppingCapability);