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 qtVersion and qtNamespace.

Task-number: QTCREATORBUG-29168
Change-Id: I202105efc6e55c852e3b00e648c11bc19f7b02b0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-13 17:48:14 +01:00
parent cbbac16d95
commit 2d79c1b266
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -1046,8 +1046,8 @@ void CdbEngine::doUpdateLocals(const UpdateParameters &updateParameters)
cmd.arg("partialvar", updateParameters.partialVariable); cmd.arg("partialvar", updateParameters.partialVariable);
cmd.arg("qobjectnames", s.showQObjectNames()); cmd.arg("qobjectnames", s.showQObjectNames());
cmd.arg("timestamps", s.logTimeStamps()); cmd.arg("timestamps", s.logTimeStamps());
cmd.arg("qtversion", runParameters().qtVersion); cmd.arg("qtversion", runParameters().qtVersion());
cmd.arg("qtnamespace", runParameters().qtNamespace); cmd.arg("qtnamespace", runParameters().qtNamespace());
StackFrame frame = stackHandler()->currentFrame(); StackFrame frame = stackHandler()->currentFrame();
cmd.arg("context", frame.context); cmd.arg("context", frame.context);

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

@@ -192,7 +192,7 @@ DebuggerRunParameters DebuggerRunParameters::fromRunControl(ProjectExplorer::Run
if (QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(kit)) { if (QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(kit)) {
const QVersionNumber qtVersion = baseQtVersion->qtVersion(); const QVersionNumber qtVersion = baseQtVersion->qtVersion();
params.qtVersion = 0x10000 * qtVersion.majorVersion() params.m_qtVersion = 0x10000 * qtVersion.majorVersion()
+ 0x100 * qtVersion.minorVersion() + 0x100 * qtVersion.minorVersion()
+ qtVersion.microVersion(); + qtVersion.microVersion();
} }

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

@@ -241,8 +241,8 @@ public:
void setTestCase(int testCase) { m_testCase = testCase; } void setTestCase(int testCase) { m_testCase = testCase; }
int testCase() const { return m_testCase; } int testCase() const { return m_testCase; }
int qtVersion = 0; int qtVersion() const { return m_qtVersion; }
QString qtNamespace; QString qtNamespace() const { return m_qtNamespace; };
// Common debugger constants. // Common debugger constants.
Utils::FilePath peripheralDescriptionFile; Utils::FilePath peripheralDescriptionFile;
@@ -336,6 +336,9 @@ private:
int m_testCase = 0; // For Debugger testing. int m_testCase = 0; // For Debugger testing.
QStringList m_validationErrors; QStringList m_validationErrors;
int m_qtVersion = 0;
QString m_qtNamespace;
}; };
namespace Internal { namespace Internal {

4
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -5164,8 +5164,8 @@ void GdbEngine::doUpdateLocals(const UpdateParameters &params)
cmd.arg("dyntype", s.useDynamicType()); cmd.arg("dyntype", s.useDynamicType());
cmd.arg("qobjectnames", s.showQObjectNames()); cmd.arg("qobjectnames", s.showQObjectNames());
cmd.arg("timestamps", s.logTimeStamps()); cmd.arg("timestamps", s.logTimeStamps());
cmd.arg("qtversion", runParameters().qtVersion); cmd.arg("qtversion", runParameters().qtVersion());
cmd.arg("qtnamespace", runParameters().qtNamespace); cmd.arg("qtnamespace", runParameters().qtNamespace());
StackFrame frame = stackHandler()->currentFrame(); StackFrame frame = stackHandler()->currentFrame();
cmd.arg("context", frame.context); cmd.arg("context", frame.context);

4
src/plugins/debugger/lldb/lldbengine.cpp
View File

@@ -768,8 +768,8 @@ void LldbEngine::doUpdateLocals(const UpdateParameters &params)
cmd.arg("partialvar", params.partialVariable); cmd.arg("partialvar", params.partialVariable);
cmd.arg("qobjectnames", s.showQObjectNames()); cmd.arg("qobjectnames", s.showQObjectNames());
cmd.arg("timestamps", s.logTimeStamps()); cmd.arg("timestamps", s.logTimeStamps());
cmd.arg("qtversion", runParameters().qtVersion); cmd.arg("qtversion", runParameters().qtVersion());
cmd.arg("qtnamespace", runParameters().qtNamespace); cmd.arg("qtnamespace", runParameters().qtNamespace());
StackFrame frame = stackHandler()->currentFrame(); StackFrame frame = stackHandler()->currentFrame();
cmd.arg("context", frame.context); cmd.arg("context", frame.context);