mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build without BT support

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-11-24 09:04:28 -08:00
parent ad4ea65493
commit 160c7c56ef
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/configuredivecomputerdialog.cpp
View file

@ -904,8 +904,12 @@ void ConfigureDiveComputerDialog::configError(QString err)
void ConfigureDiveComputerDialog::getDeviceData() void ConfigureDiveComputerDialog::getDeviceData()
{ {
#ifdef BT_SUPPORT
QString device = ui.bluetoothMode && btDeviceSelectionDialog ? QString device = ui.bluetoothMode && btDeviceSelectionDialog ?
btDeviceSelectionDialog->getSelectedDeviceAddress() : ui.device->currentText(); btDeviceSelectionDialog->getSelectedDeviceAddress() : ui.device->currentText();
#else
QString device = ui.device->currentText();
#endif
device_data.devname = strdup(device.toUtf8().data()); device_data.devname = strdup(device.toUtf8().data());
device_data.vendor = strdup(selected_vendor.toUtf8().data()); device_data.vendor = strdup(selected_vendor.toUtf8().data());
device_data.product = strdup(selected_product.toUtf8().data()); device_data.product = strdup(selected_product.toUtf8().data());
@ -915,8 +919,10 @@ void ConfigureDiveComputerDialog::getDeviceData()
auto dc = SettingsObjectWrapper::instance()->dive_computer_settings; auto dc = SettingsObjectWrapper::instance()->dive_computer_settings;
dc->setDevice(device_data.devname); dc->setDevice(device_data.devname);
#ifdef BT_SUPPORT
if (ui.bluetoothMode && btDeviceSelectionDialog) if (ui.bluetoothMode && btDeviceSelectionDialog)
dc->setDeviceName(btDeviceSelectionDialog->getSelectedDeviceName()); dc->setDeviceName(btDeviceSelectionDialog->getSelectedDeviceName());
#endif
} }
void ConfigureDiveComputerDialog::on_cancel_clicked() void ConfigureDiveComputerDialog::on_cancel_clicked()