forked from qt-creator/qt-creator
Debugger: Transform DebuggerRunParameters::version
Task-number: QTCREATORBUG-29168 Change-Id: I837865c6689bb5e55991b8fd7459b1db7bd14750 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -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;
|
||||
|
@@ -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();
|
||||
|
@@ -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 {
|
||||
|
Reference in New Issue
Block a user