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

Only enable Bluetooth support if building against Qt5.4 or newer

Browse source 
Also remove the quick hack from commit 947fda14c5 ("Bluetooth support:
quick build fix for Qt5.2"). I should have thought this through before
pushing that commit, but oh well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-07-20 09:35:00 -07:00
parent 947fda14c5
commit 43798702ff
4 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/downloadfromdivecomputer.h
View file

@ -10,7 +10,10 @@
#include "libdivecomputer.h"
#include "configuredivecomputerdialog.h"
#include "ui_downloadfromdivecomputer.h"
#if defined(BT_SUPPORT)
#include "btdeviceselectiondialog.h"
#endif
class QStringListModel;
@ -78,12 +81,13 @@ slots:
void updateProgressBar();
void checkLogFile(int state);
void checkDumpFile(int state);
void enableBluetoothMode(int state);
void pickDumpFile();
void pickLogFile();
#if defined(BT_SUPPORT)
void enableBluetoothMode(int state);
void selectRemoteBluetoothDevice();
void bluetoothSelectionDialogIsFinished(int result);
#endif
private:
void markChildrenAsDisabled();
void markChildrenAsEnabled();
@ -108,7 +112,9 @@ private:
bool dumpWarningShown;
OstcFirmwareCheck *ostcFirmwareCheck;
DiveImportedModel *diveImportedModel;
#if defined(BT_SUPPORT)
BtDeviceSelectionDialog *btDeviceSelectionDialog;
#endif
public:
bool preferDownloaded();