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

Debugger: Allow selection of "target extended-remote"

Browse Source 
... when attaching to a running gdbserver.

This enables use of gdbservers that have been started with --multi,
by adding to the "Init Commands" something like

   run /path/to/binary <args>

Change-Id: I498b2287f8ab1dee68edf6f29a1b7261b17897ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-10 17:16:40 +02:00
parent 3d092b8c28
commit 85d685ccea
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,6 +83,7 @@ public:
PathChooser *workingDirectory; PathChooser *workingDirectory;
QCheckBox *breakAtMainCheckBox; QCheckBox *breakAtMainCheckBox;
QCheckBox *runInTerminalCheckBox; QCheckBox *runInTerminalCheckBox;
QCheckBox *useTargetExtendedCheckBox;
PathChooser *debuginfoPathChooser; PathChooser *debuginfoPathChooser;
QLabel *serverStartScriptLabel; QLabel *serverStartScriptLabel;
PathChooser *serverStartScriptPathChooser; PathChooser *serverStartScriptPathChooser;
@@ -127,6 +128,7 @@ public:
Runnable runnable; Runnable runnable;
bool breakAtMain = false; bool breakAtMain = false;
bool runInTerminal = false; bool runInTerminal = false;
bool useTargetExtended = false;
FilePath serverStartScript; FilePath serverStartScript;
FilePath sysRoot; FilePath sysRoot;
QString serverInitCommands; QString serverInitCommands;
@@ -181,6 +183,7 @@ void StartApplicationParameters::toSettings(QSettings *settings) const
settings->setValue("LastExternalWorkingDirectory", runnable.workingDirectory); settings->setValue("LastExternalWorkingDirectory", runnable.workingDirectory);
settings->setValue("LastExternalBreakAtMain", breakAtMain); settings->setValue("LastExternalBreakAtMain", breakAtMain);
settings->setValue("LastExternalRunInTerminal", runInTerminal); settings->setValue("LastExternalRunInTerminal", runInTerminal);
settings->setValue("LastExternalUseTargetExtended", useTargetExtended);
settings->setValue("LastServerStartScript", serverStartScript.toVariant()); settings->setValue("LastServerStartScript", serverStartScript.toVariant());
settings->setValue("LastServerInitCommands", serverInitCommands); settings->setValue("LastServerInitCommands", serverInitCommands);
settings->setValue("LastServerResetCommands", serverResetCommands); settings->setValue("LastServerResetCommands", serverResetCommands);
@@ -198,6 +201,7 @@ void StartApplicationParameters::fromSettings(const QSettings *settings)
runnable.workingDirectory = settings->value("LastExternalWorkingDirectory").toString(); runnable.workingDirectory = settings->value("LastExternalWorkingDirectory").toString();
breakAtMain = settings->value("LastExternalBreakAtMain").toBool(); breakAtMain = settings->value("LastExternalBreakAtMain").toBool();
runInTerminal = settings->value("LastExternalRunInTerminal").toBool(); runInTerminal = settings->value("LastExternalRunInTerminal").toBool();
useTargetExtended = settings->value("LastExternalUseTargetExtended").toBool();
serverStartScript = FilePath::fromVariant(settings->value("LastServerStartScript")); serverStartScript = FilePath::fromVariant(settings->value("LastServerStartScript"));
serverInitCommands = settings->value("LastServerInitCommands").toString(); serverInitCommands = settings->value("LastServerInitCommands").toString();
serverResetCommands = settings->value("LastServerResetCommands").toString(); serverResetCommands = settings->value("LastServerResetCommands").toString();
@@ -254,6 +258,8 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent)
d->breakAtMainCheckBox = new QCheckBox(this); d->breakAtMainCheckBox = new QCheckBox(this);
d->breakAtMainCheckBox->setText(QString()); d->breakAtMainCheckBox->setText(QString());
d->useTargetExtendedCheckBox = new QCheckBox(this);
d->serverStartScriptPathChooser = new PathChooser(this); d->serverStartScriptPathChooser = new PathChooser(this);
d->serverStartScriptPathChooser->setExpectedKind(PathChooser::File); d->serverStartScriptPathChooser->setExpectedKind(PathChooser::File);
d->serverStartScriptPathChooser->setPromptDialogTitle(tr("Select Server Start Script")); d->serverStartScriptPathChooser->setPromptDialogTitle(tr("Select Server Start Script"));
@@ -321,6 +327,7 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent)
formLayout->addRow(tr("&Working directory:"), d->workingDirectory); formLayout->addRow(tr("&Working directory:"), d->workingDirectory);
formLayout->addRow(tr("Run in &terminal:"), d->runInTerminalCheckBox); formLayout->addRow(tr("Run in &terminal:"), d->runInTerminalCheckBox);
formLayout->addRow(tr("Break at \"&main\":"), d->breakAtMainCheckBox); formLayout->addRow(tr("Break at \"&main\":"), d->breakAtMainCheckBox);
formLayout->addRow(tr("Use target-extended to connect:"), d->useTargetExtendedCheckBox);
formLayout->addRow(d->serverStartScriptLabel, d->serverStartScriptPathChooser); formLayout->addRow(d->serverStartScriptLabel, d->serverStartScriptPathChooser);
formLayout->addRow(d->sysRootLabel, d->sysRootPathChooser); formLayout->addRow(d->sysRootLabel, d->sysRootPathChooser);
formLayout->addRow(d->serverInitCommandsLabel, d->serverInitCommandsTextEdit); formLayout->addRow(d->serverInitCommandsLabel, d->serverInitCommandsTextEdit);
@@ -462,6 +469,7 @@ void StartApplicationDialog::run(bool attachRemote)
debugger->setCommandsAfterConnect(newParameters.serverInitCommands); debugger->setCommandsAfterConnect(newParameters.serverInitCommands);
debugger->setCommandsForReset(newParameters.serverResetCommands); debugger->setCommandsForReset(newParameters.serverResetCommands);
debugger->setUseTerminal(newParameters.runInTerminal); debugger->setUseTerminal(newParameters.runInTerminal);
debugger->setUseExtendedRemote(newParameters.useTargetExtended);
if (!newParameters.sysRoot.isEmpty()) if (!newParameters.sysRoot.isEmpty())
debugger->setSysRoot(newParameters.sysRoot); debugger->setSysRoot(newParameters.sysRoot);
@@ -509,6 +517,7 @@ StartApplicationParameters StartApplicationDialog::parameters() const
result.runnable.workingDirectory = d->workingDirectory->filePath().toString(); result.runnable.workingDirectory = d->workingDirectory->filePath().toString();
result.breakAtMain = d->breakAtMainCheckBox->isChecked(); result.breakAtMain = d->breakAtMainCheckBox->isChecked();
result.runInTerminal = d->runInTerminalCheckBox->isChecked(); result.runInTerminal = d->runInTerminalCheckBox->isChecked();
result.useTargetExtended = d->useTargetExtendedCheckBox->isChecked();
return result; return result;
} }
@@ -525,8 +534,9 @@ void StartApplicationDialog::setParameters(const StartApplicationParameters &p)
d->debuginfoPathChooser->setPath(p.debugInfoLocation); d->debuginfoPathChooser->setPath(p.debugInfoLocation);
d->arguments->setText(p.runnable.commandLineArguments); d->arguments->setText(p.runnable.commandLineArguments);
d->workingDirectory->setPath(p.runnable.workingDirectory); d->workingDirectory->setPath(p.runnable.workingDirectory);
d->runInTerminalCheckBox->setChecked(p.runInTerminal);
d->breakAtMainCheckBox->setChecked(p.breakAtMain); d->breakAtMainCheckBox->setChecked(p.breakAtMain);
d->runInTerminalCheckBox->setChecked(p.runInTerminal);
d->useTargetExtendedCheckBox->setChecked(p.useTargetExtended);
updateState(); updateState();
} }