Debugger: Transform a few fields of DebuggerRunParameters

Transform qtVersion and qtNamespace.

Task-number: QTCREATORBUG-29168
Change-Id: I202105efc6e55c852e3b00e648c11bc19f7b02b0
Reviewed-by: hjk <[email protected]>

5 files changed, 12 insertions, 9 deletions

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 8f73275965d..adbcb9e9c07 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -1046,8 +1046,8 @@ void CdbEngine::doUpdateLocals(const UpdateParameters &updateParameters)
         cmd.arg("partialvar", updateParameters.partialVariable);
         cmd.arg("qobjectnames", s.showQObjectNames());
         cmd.arg("timestamps", s.logTimeStamps());
-        cmd.arg("qtversion", runParameters().qtVersion);
-        cmd.arg("qtnamespace", runParameters().qtNamespace);
+        cmd.arg("qtversion", runParameters().qtVersion());
+        cmd.arg("qtnamespace", runParameters().qtNamespace());
 
         StackFrame frame = stackHandler()->currentFrame();
         cmd.arg("context", frame.context);
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index e1144e05212..9ead9e44418 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -192,7 +192,7 @@ DebuggerRunParameters DebuggerRunParameters::fromRunControl(ProjectExplorer::Run
 
     if (QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(kit)) {
         const QVersionNumber qtVersion = baseQtVersion->qtVersion();
-        params.qtVersion = 0x10000 * qtVersion.majorVersion()
+        params.m_qtVersion = 0x10000 * qtVersion.majorVersion()
                            + 0x100 * qtVersion.minorVersion()
                            + qtVersion.microVersion();
     }
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 688398af89d..026df9b5c66 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -241,8 +241,8 @@ public:
     void setTestCase(int testCase) { m_testCase = testCase; }
     int testCase() const { return m_testCase; }
 
-    int qtVersion = 0;
-    QString qtNamespace;
+    int qtVersion() const { return m_qtVersion; }
+    QString qtNamespace() const { return m_qtNamespace; };
 
     // Common debugger constants.
     Utils::FilePath peripheralDescriptionFile;
@@ -336,6 +336,9 @@ private:
 
     int m_testCase = 0; // For Debugger testing.
     QStringList m_validationErrors;
+
+    int m_qtVersion = 0;
+    QString m_qtNamespace;
 };
 
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 388543766c1..d162afd9499 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -5164,8 +5164,8 @@ void GdbEngine::doUpdateLocals(const UpdateParameters &params)
     cmd.arg("dyntype", s.useDynamicType());
     cmd.arg("qobjectnames", s.showQObjectNames());
     cmd.arg("timestamps", s.logTimeStamps());
-    cmd.arg("qtversion", runParameters().qtVersion);
-    cmd.arg("qtnamespace", runParameters().qtNamespace);
+    cmd.arg("qtversion", runParameters().qtVersion());
+    cmd.arg("qtnamespace", runParameters().qtNamespace());
 
     StackFrame frame = stackHandler()->currentFrame();
     cmd.arg("context", frame.context);
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 15f31222537..2d4337ab9ee 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -768,8 +768,8 @@ void LldbEngine::doUpdateLocals(const UpdateParameters &params)
     cmd.arg("partialvar", params.partialVariable);
     cmd.arg("qobjectnames", s.showQObjectNames());
     cmd.arg("timestamps", s.logTimeStamps());
-    cmd.arg("qtversion", runParameters().qtVersion);
-    cmd.arg("qtnamespace", runParameters().qtNamespace);
+    cmd.arg("qtversion", runParameters().qtVersion());
+    cmd.arg("qtnamespace", runParameters().qtNamespace());
 
     StackFrame frame = stackHandler()->currentFrame();
     cmd.arg("context", frame.context);