From 43798702ff40586031f480b11a59c21cf7b4228b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 20 Jul 2015 09:35:00 -0700 Subject: 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 --- qt-ui/downloadfromdivecomputer.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'qt-ui/downloadfromdivecomputer.h') 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(); -- cgit v1.2.3-70-g09d2