Debugger: Transform DebuggerRunParameters::version

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

3 files changed, 6 insertions, 4 deletions

diff --git a/src/plugins/debugger/dap/gdbdapengine.cpp b/src/plugins/debugger/dap/gdbdapengine.cpp
index b5a6685a960..e03e4605605 100644
--- a/src/plugins/debugger/dap/gdbdapengine.cpp
+++ b/src/plugins/debugger/dap/gdbdapengine.cpp
@@ -144,10 +144,10 @@ void GdbDapEngine::setupEngine()
         cmd.addArgs({"-p", QString::number(rp.attachPid().pid())});
 
     QVersionNumber oldestVersion(14, 0, 50);
-    QVersionNumber version = QVersionNumber::fromString(rp.version);
+    QVersionNumber version = QVersionNumber::fromString(rp.version());
     if (version < oldestVersion) {
         notifyEngineSetupFailed();
-        MessageManager::writeDisrupting("Debugger version " + rp.version
+        MessageManager::writeDisrupting("Debugger version " + rp.version()
                                         + " is too old. Please upgrade to at least "
                                         + oldestVersion.toString());
         return;
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index a448ed05777..d6ff0c4a1f5 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -140,7 +140,7 @@ DebuggerRunParameters DebuggerRunParameters::fromRunControl(ProjectExplorer::Run
     params.macroExpander = runControl->macroExpander();
     params.debugger = DebuggerKitAspect::runnable(kit);
     params.m_cppEngineType = DebuggerKitAspect::engineType(kit);
-    params.version = DebuggerKitAspect::version(kit);
+    params.m_version = DebuggerKitAspect::version(kit);
 
     if (QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit))
         params.qtSourceLocation = qtVersion->sourcePath();
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index dee11b935fe..8586ac6cdba 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -180,7 +180,7 @@ public:
 
     DebuggerEngineType cppEngineType() const { return m_cppEngineType; }
 
-    QString version;
+    QString version() const { return m_version; }
 
     bool isPythonDebugging = false;
     bool breakOnMain = false;
@@ -284,6 +284,8 @@ private:
     QString m_additionalStartupCommands;
 
     DebuggerEngineType m_cppEngineType = NoEngineType;
+
+    QString m_version;
 };
 
 namespace Internal {