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

Debugger: Use FilePath for debugInfoLocation

Browse Source 
Change-Id: Id538ab4ddd1d634d0dc73a00fe42d3fd35341bea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-09-27 11:11:18 +02:00
parent 9c97e03465
commit 4b5aeb9a74
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -130,7 +130,7 @@ public:
FilePath sysRoot;
QString serverInitCommands;
QString serverResetCommands;
QString debugInfoLocation;
FilePath debugInfoLocation;
};
bool StartApplicationParameters::equals(const StartApplicationParameters &rhs) const
@@ -181,7 +181,7 @@ void StartApplicationParameters::toSettings(QSettings *settings) const
settings->setValue("LastExternalUseTargetExtended", useTargetExtendedRemote);
settings->setValue("LastServerInitCommands", serverInitCommands);
settings->setValue("LastServerResetCommands", serverResetCommands);
settings->setValue("LastDebugInfoLocation", debugInfoLocation);
settings->setValue("LastDebugInfoLocation", debugInfoLocation.toVariant());
settings->setValue("LastSysRoot", sysRoot.toVariant());
}
@@ -198,7 +198,7 @@ void StartApplicationParameters::fromSettings(const QSettings *settings)
useTargetExtendedRemote = settings->value("LastExternalUseTargetExtended").toBool();
serverInitCommands = settings->value("LastServerInitCommands").toString();
serverResetCommands = settings->value("LastServerResetCommands").toString();
debugInfoLocation = settings->value("LastDebugInfoLocation").toString();
debugInfoLocation = FilePath::fromVariant(settings->value("LastDebugInfoLocation"));
sysRoot = FilePath::fromVariant(settings->value("LastSysRoot"));
}
@@ -487,7 +487,7 @@ StartApplicationParameters StartApplicationDialog::parameters() const
result.serverInitCommands = d->serverInitCommandsTextEdit->toPlainText();
result.serverResetCommands = d->serverResetCommandsTextEdit->toPlainText();
result.kitId = d->kitChooser->currentKitId();
result.debugInfoLocation = d->debuginfoPathChooser->filePath().toString();
result.debugInfoLocation = d->debuginfoPathChooser->filePath();
result.runnable.command.setArguments(d->arguments->text());
result.runnable.workingDirectory = d->workingDirectory->filePath();
result.breakAtMain = d->breakAtMainCheckBox->isChecked();
@@ -505,7 +505,7 @@ void StartApplicationDialog::setParameters(const StartApplicationParameters &p)
d->sysRootPathChooser->setFilePath(p.sysRoot);
d->serverInitCommandsTextEdit->setPlainText(p.serverInitCommands);
d->serverResetCommandsTextEdit->setPlainText(p.serverResetCommands);
d->debuginfoPathChooser->setPath(p.debugInfoLocation);
d->debuginfoPathChooser->setFilePath(p.debugInfoLocation);
d->arguments->setText(p.runnable.command.arguments());
d->workingDirectory->setFilePath(p.runnable.workingDirectory);
d->breakAtMainCheckBox->setChecked(p.breakAtMain);