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

Debugger: Transform DebuggerRunParameters::version

Browse Source 
Task-number: QTCREATORBUG-29168
Change-Id: I837865c6689bb5e55991b8fd7459b1db7bd14750
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-13 12:04:46 +01:00
parent 590c23f985
commit f2f4e30334
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/dap/gdbdapengine.cpp
View File

@@ -144,10 +144,10 @@ void GdbDapEngine::setupEngine()
cmd.addArgs({"-p", QString::number(rp.attachPid().pid())}); cmd.addArgs({"-p", QString::number(rp.attachPid().pid())});
QVersionNumber oldestVersion(14, 0, 50); QVersionNumber oldestVersion(14, 0, 50);
QVersionNumber version = QVersionNumber::fromString(rp.version); QVersionNumber version = QVersionNumber::fromString(rp.version());
if (version < oldestVersion) { if (version < oldestVersion) {
notifyEngineSetupFailed(); notifyEngineSetupFailed();
MessageManager::writeDisrupting("Debugger version " + rp.version MessageManager::writeDisrupting("Debugger version " + rp.version()
+ " is too old. Please upgrade to at least " + " is too old. Please upgrade to at least "
+ oldestVersion.toString()); + oldestVersion.toString());
return; return;

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

@@ -140,7 +140,7 @@ DebuggerRunParameters DebuggerRunParameters::fromRunControl(ProjectExplorer::Run
params.macroExpander = runControl->macroExpander(); params.macroExpander = runControl->macroExpander();
params.debugger = DebuggerKitAspect::runnable(kit); params.debugger = DebuggerKitAspect::runnable(kit);
params.m_cppEngineType = DebuggerKitAspect::engineType(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)) if (QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit))
params.qtSourceLocation = qtVersion->sourcePath(); params.qtSourceLocation = qtVersion->sourcePath();

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

@@ -180,7 +180,7 @@ public:
DebuggerEngineType cppEngineType() const { return m_cppEngineType; } DebuggerEngineType cppEngineType() const { return m_cppEngineType; }
QString version; QString version() const { return m_version; }
bool isPythonDebugging = false; bool isPythonDebugging = false;
bool breakOnMain = false; bool breakOnMain = false;
@@ -284,6 +284,8 @@ private:
QString m_additionalStartupCommands; QString m_additionalStartupCommands;
DebuggerEngineType m_cppEngineType = NoEngineType; DebuggerEngineType m_cppEngineType = NoEngineType;
QString m_version;
}; };
namespace Internal { namespace Internal {