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 building without BT support

Browse source 
I guess no one had tried this in a while.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-10-26 06:05:27 -07:00
parent 1d10a56bdf
commit 3b0f38f24a
5 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/configuredivecomputerdialog.cpp
View file

@ -115,8 +115,12 @@ void GasTypeComboBoxItemDelegate::setModelData(QWidget *editor, QAbstractItemMod
ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : QDialog(parent),
config(0),
#ifdef BT_SUPPORT
deviceDetails(0),
btDeviceSelectionDialog(0)
#else
deviceDetails(0)
#endif
{
ui.setupUi(this);
@ -134,7 +138,7 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : QDia
connect(ui.logToFile, SIGNAL(stateChanged(int)), this, SLOT(checkLogFile(int)));
connect(ui.connectButton, SIGNAL(clicked()), this, SLOT(dc_open()));
connect(ui.disconnectButton, SIGNAL(clicked()), this, SLOT(dc_close()));
#if BT_SUPPORT
#ifdef BT_SUPPORT
connect(ui.bluetoothMode, SIGNAL(clicked(bool)), this, SLOT(selectRemoteBluetoothDevice()));
#else
ui.bluetoothMode->setVisible(false);

6
qt-ui/configuredivecomputerdialog.h
View file

@ -8,7 +8,9 @@
#include "configuredivecomputer.h"
#include <QStyledItemDelegate>
#include <QNetworkAccessManager>
#ifdef BT_SUPPORT
#include "btdeviceselectiondialog.h"
#endif
class GasSpinBoxItemDelegate : public QStyledItemDelegate {
Q_OBJECT
@ -85,7 +87,7 @@ slots:
void dc_open();
void dc_close();
#if BT_SUPPORT
#ifdef BT_SUPPORT
void bluetoothSelectionDialogIsFinished(int result);
void selectRemoteBluetoothDevice();
#endif
@ -119,7 +121,9 @@ private:
QString selected_product;
bool fw_upgrade_possible;
#ifdef BT_SUPPORT
BtDeviceSelectionDialog *btDeviceSelectionDialog;
#endif
};
class OstcFirmwareCheck : QObject {