feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Transform a few fields of DebuggerRunParameters

Browse Source 
Transform applicationPid and applicationMainThreadId.

Task-number: QTCREATORBUG-29168
Change-Id: Ib54bb535e0b3f4f854cd06e0253b5f8b2b7d2c30
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-13 16:23:37 +01:00
parent 0b22421da4
commit 94b188c6fc
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerengine.cpp
View File

@@ -2313,13 +2313,13 @@ bool DebuggerEngine::usesTerminal() const
qint64 DebuggerEngine::applicationPid() const qint64 DebuggerEngine::applicationPid() const
{ {
QTC_CHECK(usesTerminal()); QTC_CHECK(usesTerminal());
return d->m_runParameters.applicationPid; return d->m_runParameters.applicationPid();
} }
qint64 DebuggerEngine::applicationMainThreadId() const qint64 DebuggerEngine::applicationMainThreadId() const
{ {
QTC_CHECK(usesTerminal()); QTC_CHECK(usesTerminal());
return d->m_runParameters.applicationMainThreadId; return d->m_runParameters.applicationMainThreadId();
} }
void DebuggerEngine::interruptTerminal() const void DebuggerEngine::interruptTerminal() const

11
src/plugins/debugger/debuggerengine.h
View File

@@ -215,9 +215,11 @@ public:
Utils::FilePath projectSourceDirectory() const { return m_projectSourceDirectory; } Utils::FilePath projectSourceDirectory() const { return m_projectSourceDirectory; }
Utils::FilePaths projectSourceFiles() const { return m_projectSourceFiles; } Utils::FilePaths projectSourceFiles() const { return m_projectSourceFiles; }
// Terminal void setApplicationPid(qint64 pid) { m_applicationPid = pid; }
qint64 applicationPid = 0; qint64 applicationPid() const { return m_applicationPid; }
qint64 applicationMainThreadId = 0;
void setApplicationMainThreadId(qint64 threadId) { m_applicationMainThreadId = threadId; }
qint64 applicationMainThreadId() const { return m_applicationMainThreadId; }
// Used by Script debugging // Used by Script debugging
Utils::FilePath interpreter; Utils::FilePath interpreter;
@@ -320,6 +322,9 @@ private:
Utils::FilePath m_projectSourceDirectory; Utils::FilePath m_projectSourceDirectory;
Utils::FilePaths m_projectSourceFiles; Utils::FilePaths m_projectSourceFiles;
qint64 m_applicationPid = 0; // Terminal
qint64 m_applicationMainThreadId = 0; // Terminal
}; };
namespace Internal { namespace Internal {

4
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -215,8 +215,8 @@ void DebuggerRunTool::startTerminalIfNeededAndContinueStartup()
d->terminalProc.setRunData(stub); d->terminalProc.setRunData(stub);
connect(&d->terminalProc, &Process::started, this, [this] { connect(&d->terminalProc, &Process::started, this, [this] {
m_runParameters.applicationPid = d->terminalProc.processId(); m_runParameters.setApplicationPid(d->terminalProc.processId());
m_runParameters.applicationMainThreadId = d->terminalProc.applicationMainThreadId(); m_runParameters.setApplicationMainThreadId(d->terminalProc.applicationMainThreadId());
continueAfterTerminalStart(); continueAfterTerminalStart();
}); });