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 
Change-Id: Ia8fed69168d87afafdb5acf4de4d5d30f9b4ebf5
This commit is contained in:
Eike Ziller
2019-01-31 08:38:13 +01:00
parent 54c2dff181 ac382b68b7
commit 868160f215
20 changed files with 212 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/debugger/lldbbridge.py
+2 -10
View File
@@ -858,16 +858,12 @@ class Dumper(DumperBase):
pass
self.ignoreStops = 0
self.silentStops = 0
if platform.system() == 'Linux':
if self.startMode_ == AttachCore:
pass
else:
if self.useTerminal_:
self.ignoreStops = 2
else:
self.silentStops = 1
else:
if self.useTerminal_:
self.ignoreStops = 1
@@ -878,10 +874,8 @@ class Dumper(DumperBase):
if self.sysRoot_:
self.debugger.SetCurrentPlatformSDKRoot(self.sysRoot_)
if os.path.isfile(self.executable_):
self.target = self.debugger.CreateTarget(self.executable_, None, None, True, error)
else:
self.target = self.debugger.CreateTarget(None, None, None, True, error)
exefile = None if self.attachPid_ > 0 else self.executable_
self.target = self.debugger.CreateTarget(exefile, None, None, True, error)
if self.nativeMixed:
self.interpreterEventBreakpoint = \
@@ -1345,8 +1339,6 @@ class Dumper(DumperBase):
elif self.ignoreStops > 0:
self.ignoreStops -= 1
self.process.Continue()
elif self.silentStops > 0:
self.silentStops -= 1
else:
self.reportState("stopped")
else: