diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 9fd5c8fe5b9..0ce9529f2c9 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -2313,13 +2313,13 @@ bool DebuggerEngine::usesTerminal() const
 qint64 DebuggerEngine::applicationPid() const
 {
     QTC_CHECK(usesTerminal());
-    return d->m_runParameters.applicationPid;
+    return d->m_runParameters.applicationPid();
 }
 
 qint64 DebuggerEngine::applicationMainThreadId() const
 {
     QTC_CHECK(usesTerminal());
-    return d->m_runParameters.applicationMainThreadId;
+    return d->m_runParameters.applicationMainThreadId();
 }
 
 void DebuggerEngine::interruptTerminal() const
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 6c0652e0ddb..50552004590 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -215,9 +215,11 @@ public:
     Utils::FilePath projectSourceDirectory() const { return m_projectSourceDirectory; }
     Utils::FilePaths projectSourceFiles() const { return m_projectSourceFiles; }
 
-    // Terminal
-    qint64 applicationPid = 0;
-    qint64 applicationMainThreadId = 0;
+    void setApplicationPid(qint64 pid) { m_applicationPid = pid; }
+    qint64 applicationPid() const { return m_applicationPid; }
+
+    void setApplicationMainThreadId(qint64 threadId) { m_applicationMainThreadId = threadId; }
+    qint64 applicationMainThreadId() const { return m_applicationMainThreadId; }
 
     // Used by Script debugging
     Utils::FilePath interpreter;
@@ -320,6 +322,9 @@ private:
 
     Utils::FilePath m_projectSourceDirectory;
     Utils::FilePaths m_projectSourceFiles;
+
+    qint64 m_applicationPid = 0; // Terminal
+    qint64 m_applicationMainThreadId = 0; // Terminal
 };
 
 namespace Internal {
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index a4434cb45c1..3631449a421 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -215,8 +215,8 @@ void DebuggerRunTool::startTerminalIfNeededAndContinueStartup()
     d->terminalProc.setRunData(stub);
 
     connect(&d->terminalProc, &Process::started, this, [this] {
-        m_runParameters.applicationPid = d->terminalProc.processId();
-        m_runParameters.applicationMainThreadId = d->terminalProc.applicationMainThreadId();
+        m_runParameters.setApplicationPid(d->terminalProc.processId());
+        m_runParameters.setApplicationMainThreadId(d->terminalProc.applicationMainThreadId());
         continueAfterTerminalStart();
     });