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

Remove cygwin options now that we have a GDB which was build with MinGW.

Browse Source 
Also, remove COM port selection on windows. It is taken from the run
configuration in case of Windows anyway.

Reviewed-By: Friedemann Kleint
This commit is contained in:
Daniel Molkentin
2009-10-09 14:20:14 +02:00
parent 7856541d0e
commit 555f8a02ec
5 changed files with 7 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/gdb/trkoptionswidget.cpp
View File

@@ -41,16 +41,12 @@ TrkOptionsWidget::TrkOptionsWidget(QWidget *parent) :
{
ui->setupUi(this);
ui->gdbChooser->setExpectedKind(Utils::PathChooser::Command);
ui->cygwinChooser->setExpectedKind(Utils::PathChooser::Directory);
ui->blueToothComboBox->addItems(TrkOptions::blueToothDevices());
ui->serialComboBox->addItems(TrkOptions::serialPorts());
connect(ui->commComboBox, SIGNAL(currentIndexChanged(int)), ui->commStackedWidget, SLOT(setCurrentIndex(int)));
// No bluetooth on Windows yet...
#ifdef Q_OS_WIN
ui->commComboBox->setEnabled(false);
#else
ui->cygwinChooser->setVisible(false);
ui->cygwinLabel->setVisible(false);
ui->commGroupBox->setVisible(false);
#endif
}
@@ -78,7 +74,6 @@ void TrkOptionsWidget::setTrkOptions(const TrkOptions &o)
const int serialPortIndex = qMax(0, ui->serialComboBox->findText(o.serialPort));
ui->serialComboBox->setCurrentIndex(serialPortIndex);
ui->gdbChooser->setPath(o.gdb);
ui->cygwinChooser->setPath(o.cygwin);
const int blueToothIndex = qMax(0, ui->blueToothComboBox->findText(o.blueToothDevice));
ui->blueToothComboBox->setCurrentIndex(blueToothIndex);
}
@@ -88,7 +83,6 @@ TrkOptions TrkOptionsWidget::trkOptions() const
TrkOptions rc;
rc.mode = ui->commComboBox->currentIndex();
rc.gdb = ui->gdbChooser->path();
rc.cygwin = ui->cygwinChooser->path();
rc.blueToothDevice = ui->blueToothComboBox->currentText();
rc.serialPort = ui->serialComboBox->currentText();
return rc;