diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 7eb5a0b8488c4ae4aeae92a82f184db26f9e2bcc..2665f17db827085faf05756cdece769ed02c1ab9 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -243,15 +243,17 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent) setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Start Debugger")); - d->localExecutablePathChooser = new PathChooser(this); - d->localExecutablePathChooser->setExpectedKind(PathChooser::File); - d->localExecutablePathChooser->setPromptDialogTitle(tr("Select Executable")); - d->localExecutablePathChooser->lineEdit()->setHistoryCompleter(QLatin1String("LocalExecutable")); + d->kitChooser = new KitChooser(this); + d->kitChooser->populate(); + d->serverPortLabel = new QLabel(tr("Server port:"), this); d->serverPortSpinBox = new QSpinBox(this); d->serverPortSpinBox->setRange(1, 65535); - d->serverPortLabel = new QLabel(tr("Server port:"), this); + d->localExecutablePathChooser = new PathChooser(this); + d->localExecutablePathChooser->setExpectedKind(PathChooser::File); + d->localExecutablePathChooser->setPromptDialogTitle(tr("Select Executable")); + d->localExecutablePathChooser->lineEdit()->setHistoryCompleter(QLatin1String("LocalExecutable")); d->arguments = new FancyLineEdit(this); d->arguments->setHistoryCompleter(QLatin1String("CommandlineArguments")); @@ -263,9 +265,6 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent) d->runInTerminalCheckBox = new QCheckBox(this); - d->kitChooser = new KitChooser(this); - d->kitChooser->populate(); - d->breakAtMainCheckBox = new QCheckBox(this); d->breakAtMainCheckBox->setText(QString()); diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp index c39ac6d7568336b01fbf24301d668a3612cfe190..d6dfb6cea72b249ee54353985d925d1cd8b12d2e 100644 --- a/src/plugins/debugger/loadcoredialog.cpp +++ b/src/plugins/debugger/loadcoredialog.cpp @@ -255,14 +255,14 @@ AttachCoreDialog::AttachCoreDialog(QWidget *parent) d->forceLocalLabel->setText(tr("Use local core file:")); d->forceLocalLabel->setBuddy(d->forceLocalCheckBox); - d->localCoreFileName = new PathChooser(this); - d->localCoreFileName->setExpectedKind(PathChooser::File); - d->localCoreFileName->setPromptDialogTitle(tr("Select Core File")); - d->localExecFileName = new PathChooser(this); d->localExecFileName->setExpectedKind(PathChooser::File); d->localExecFileName->setPromptDialogTitle(tr("Select Executable")); + d->localCoreFileName = new PathChooser(this); + d->localCoreFileName->setExpectedKind(PathChooser::File); + d->localCoreFileName->setPromptDialogTitle(tr("Select Core File")); + d->overrideStartScriptFileName = new PathChooser(this); d->overrideStartScriptFileName->setExpectedKind(PathChooser::File); d->overrideStartScriptFileName->setPromptDialogTitle(tr("Select Startup Script")); diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp index 6025395d08ca5e3cb6f7566da11a22ff9e57501f..ba0ef4462481e6a6f5ee4c7f24490a9c94bd8d9b 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp @@ -199,6 +199,10 @@ DeviceProcessesDialogPrivate::DeviceProcessesDialogPrivate(KitChooser *chooser, connect(&proxyModel, SIGNAL(layoutChanged()), SLOT(handleProcessListUpdated())); connect(buttonBox, SIGNAL(accepted()), q, SLOT(accept())); connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject())); + + QWidget::setTabOrder(kitChooser, processFilterLineEdit); + QWidget::setTabOrder(processFilterLineEdit, procView); + QWidget::setTabOrder(procView, buttonBox); } void DeviceProcessesDialogPrivate::setDevice(const IDevice::ConstPtr &device)