diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-20 09:35:00 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-20 09:35:00 -0700 |
| commit | 43798702ff40586031f480b11a59c21cf7b4228b (patch) | |
| tree | 248b77fcdf77b6d4c948fca7325a7231944e48b1 /qt-ui/downloadfromdivecomputer.h | |
| parent | 947fda14c5d10916572ae1232987684205632c71 (diff) | |
| download | subsurface-43798702ff40586031f480b11a59c21cf7b4228b.tar.gz | |
Only enable Bluetooth support if building against Qt5.4 or newer
Also remove the quick hack from commit 947fda14c5d1 ("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>
Diffstat (limited to 'qt-ui/downloadfromdivecomputer.h')
| -rw-r--r-- | qt-ui/downloadfromdivecomputer.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/qt-ui/downloadfromdivecomputer.h b/qt-ui/downloadfromdivecomputer.h index 734e5f7d1..7acd49e95 100644 --- a/qt-ui/downloadfromdivecomputer.h +++ b/qt-ui/downloadfromdivecomputer.h @@ -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(); |