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

BareMetal: Use more FilePath in OpenOcdGdbServerProvider

Browse Source 
Change-Id: Ie3eee9aa6765e2fb3d634ee7a6309edcf6ef9e1f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-11-10 16:34:48 +01:00
parent 1dfc996652
commit b5e935948a
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
View File

@@ -110,10 +110,10 @@ CommandLine OpenOcdGdbServerProvider::command() const
cmd.addArg("gdb_port " + QString::number(channel().port())); cmd.addArg("gdb_port " + QString::number(channel().port()));
if (!m_rootScriptsDir.isEmpty()) if (!m_rootScriptsDir.isEmpty())
cmd.addArgs({"-s", m_rootScriptsDir}); cmd.addArgs({"-s", m_rootScriptsDir.path()});
if (!m_configurationFile.isEmpty()) if (!m_configurationFile.isEmpty())
cmd.addArgs({"-f", m_configurationFile}); cmd.addArgs({"-f", m_configurationFile.path()});
if (!m_additionalArguments.isEmpty()) if (!m_additionalArguments.isEmpty())
cmd.addArgs(m_additionalArguments, CommandLine::Raw); cmd.addArgs(m_additionalArguments, CommandLine::Raw);
@@ -151,8 +151,8 @@ QVariantMap OpenOcdGdbServerProvider::toMap() const
{ {
QVariantMap data = GdbServerProvider::toMap(); QVariantMap data = GdbServerProvider::toMap();
data.insert(executableFileKeyC, m_executableFile.toVariant()); data.insert(executableFileKeyC, m_executableFile.toVariant());
data.insert(rootScriptsDirKeyC, m_rootScriptsDir); data.insert(rootScriptsDirKeyC, m_rootScriptsDir.toVariant());
data.insert(configurationFileKeyC, m_configurationFile); data.insert(configurationFileKeyC, m_configurationFile.toVariant());
data.insert(additionalArgumentsKeyC, m_additionalArguments); data.insert(additionalArgumentsKeyC, m_additionalArguments);
return data; return data;
} }
@@ -163,8 +163,8 @@ bool OpenOcdGdbServerProvider::fromMap(const QVariantMap &data)
return false; return false;
m_executableFile = FilePath::fromVariant(data.value(executableFileKeyC)); m_executableFile = FilePath::fromVariant(data.value(executableFileKeyC));
m_rootScriptsDir = data.value(rootScriptsDirKeyC).toString(); m_rootScriptsDir = FilePath::fromVariant(data.value(rootScriptsDirKeyC));
m_configurationFile = data.value(configurationFileKeyC).toString(); m_configurationFile = FilePath::fromVariant(data.value(configurationFileKeyC));
m_additionalArguments = data.value(additionalArgumentsKeyC).toString(); m_additionalArguments = data.value(additionalArgumentsKeyC).toString();
return true; return true;
} }
@@ -258,8 +258,8 @@ void OpenOcdGdbServerProviderConfigWidget::apply()
p->setChannel(m_hostWidget->channel()); p->setChannel(m_hostWidget->channel());
p->m_executableFile = m_executableFileChooser->filePath(); p->m_executableFile = m_executableFileChooser->filePath();
p->m_rootScriptsDir = m_rootScriptsDirChooser->filePath().toString(); p->m_rootScriptsDir = m_rootScriptsDirChooser->filePath();
p->m_configurationFile = m_configurationFileChooser->filePath().toString(); p->m_configurationFile = m_configurationFileChooser->filePath();
p->m_additionalArguments = m_additionalArgumentsLineEdit->text(); p->m_additionalArguments = m_additionalArgumentsLineEdit->text();
p->setInitCommands(m_initCommandsTextEdit->toPlainText()); p->setInitCommands(m_initCommandsTextEdit->toPlainText());
p->setResetCommands(m_resetCommandsTextEdit->toPlainText()); p->setResetCommands(m_resetCommandsTextEdit->toPlainText());
@@ -289,8 +289,8 @@ void OpenOcdGdbServerProviderConfigWidget::setFromProvider()
startupModeChanged(); startupModeChanged();
m_hostWidget->setChannel(p->channel()); m_hostWidget->setChannel(p->channel());
m_executableFileChooser->setFilePath(p->m_executableFile); m_executableFileChooser->setFilePath(p->m_executableFile);
m_rootScriptsDirChooser->setFilePath(Utils::FilePath::fromString(p->m_rootScriptsDir)); m_rootScriptsDirChooser->setFilePath(p->m_rootScriptsDir);
m_configurationFileChooser->setFilePath(Utils::FilePath::fromString(p->m_configurationFile)); m_configurationFileChooser->setFilePath(p->m_configurationFile);
m_additionalArgumentsLineEdit->setText(p->m_additionalArguments); m_additionalArgumentsLineEdit->setText(p->m_additionalArguments);
m_initCommandsTextEdit->setPlainText(p->initCommands()); m_initCommandsTextEdit->setPlainText(p->initCommands());
m_resetCommandsTextEdit->setPlainText(p->resetCommands()); m_resetCommandsTextEdit->setPlainText(p->resetCommands());

4
src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h
View File

@@ -59,8 +59,8 @@ private:
static QString defaultResetCommands(); static QString defaultResetCommands();
Utils::FilePath m_executableFile = "openocd"; Utils::FilePath m_executableFile = "openocd";
QString m_rootScriptsDir; Utils::FilePath m_rootScriptsDir;
QString m_configurationFile; Utils::FilePath m_configurationFile;
QString m_additionalArguments; QString m_additionalArguments;
friend class OpenOcdGdbServerProviderConfigWidget; friend class OpenOcdGdbServerProviderConfigWidget;