Debugger: Preliminary work on debugging QML-with-Terminal

The terminal needs information from the portsgatherer in the context
of QML debugging, but has no start dependency on it (yet).

This starts isolation terminal stuff for easier re-ordering later.

No change in functionality intended.

Change-Id: If75a4db6d277ae52a18851ea834d78057584248c
Reviewed-by: Christian Stenger <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 6fa342d252f..5dbc8948769 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -280,10 +280,10 @@ void CdbEngine::setupEngine()
     // console, too, but that immediately closes when the debuggee quits.
     // Use the Creator stub instead.
     DebuggerRunParameters sp = runParameters();
-    if (terminal()) {
+    if (usesTerminal()) {
         m_effectiveStartMode = AttachToLocalProcess;
         sp.inferior.command = {};
-        sp.attachPID = ProcessHandle(terminal()->applicationPid());
+        sp.attachPID = ProcessHandle(applicationPid());
         sp.startMode = AttachToLocalProcess;
         sp.useTerminal = false; // Force no terminal.
         showMessage(QString("Attaching to %1...").arg(sp.attachPID.pid()), LogMisc);
@@ -372,7 +372,7 @@ void CdbEngine::setupEngine()
         if (sp.startMode == AttachToCrashedProcess) {
             debugger.addArgs({"-e", sp.crashParameter, "-g"});
         } else {
-            if (terminal())
+            if (usesTerminal())
                 debugger.addArgs({"-pr", "-pb"});
         }
         break;