diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-06-22 17:41:21 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-06-22 17:41:21 -0700 |
| commit | d58de3716718207b9fe53fdd451c9d1e35bff38a (patch) | |
| tree | 7d0901e1d3d61366cad296c2440c541ea67867ff /desktop-widgets/downloadfromdivecomputer.cpp | |
| parent | 83e56cbfa6935ae6ea53911d1bee478749142c77 (diff) | |
| parent | add253ca9eee79f97de5bfd25a456102f49bef86 (diff) | |
| download | subsurface-d58de3716718207b9fe53fdd451c9d1e35bff38a.tar.gz | |
Merge branch 'master' of git://github.com/torvalds/subsurface-for-dirk
Diffstat (limited to 'desktop-widgets/downloadfromdivecomputer.cpp')
| -rw-r--r-- | desktop-widgets/downloadfromdivecomputer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp index 0c7213936..4104d70f2 100644 --- a/desktop-widgets/downloadfromdivecomputer.cpp +++ b/desktop-widgets/downloadfromdivecomputer.cpp @@ -87,7 +87,7 @@ DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) : ui.downloadCancelRetryButton->setEnabled(true); ui.downloadCancelRetryButton->setText(tr("Download")); -#if defined(BT_SUPPORT) && defined(SSRF_CUSTOM_SERIAL) +#if defined(BT_SUPPORT) && defined(SSRF_CUSTOM_IO) ui.bluetoothMode->setText(tr("Choose Bluetooth download mode")); ui.bluetoothMode->setChecked(dc->downloadMode() == DC_TRANSPORT_BLUETOOTH); btDeviceSelectionDialog = 0; @@ -293,7 +293,7 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked() dc->setProduct(data->product()); dc->setDevice(data->devName()); -#if defined(BT_SUPPORT) && defined(SSRF_CUSTOM_SERIAL) +#if defined(BT_SUPPORT) && defined(SSRF_CUSTOM_IO) dc->setDownloadMode(ui.bluetoothMode->isChecked() ? DC_TRANSPORT_BLUETOOTH : DC_TRANSPORT_SERIAL); #endif |