diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-06-16 12:27:55 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-06-16 14:17:42 +0200 |
| commit | 50e7588d6d2b4a21b2c4aebc0417b5cfcd8a9c03 (patch) | |
| tree | fdc93854fb3614f8557a4b53ce983ac9c09c78e0 /src/bluetooth/qlowenergycontrollernew_p.h | |
| parent | 680537e519c859c79251da94fa15740d87b5ca35 (diff) | |
Provide guarding against non-BTLE enabled versions of Bluez
This disables the gatttool based controller as well. While it might
compile on older systems they are likely to not have a
gatttool and why would a Bluez version without BTLE symbols ever
work anyway.
Change-Id: I761e482d3dd1e99008c5d170053e19a1a3a51e6c
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'src/bluetooth/qlowenergycontrollernew_p.h')
| -rw-r--r-- | src/bluetooth/qlowenergycontrollernew_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qlowenergycontrollernew_p.h b/src/bluetooth/qlowenergycontrollernew_p.h index ff6eec66..5c1d9d86 100644 --- a/src/bluetooth/qlowenergycontrollernew_p.h +++ b/src/bluetooth/qlowenergycontrollernew_p.h @@ -43,11 +43,11 @@ #define QLOWENERGYCONTROLLERNEWPRIVATE_P_H #include <qglobal.h> +#include <QtBluetooth/qbluetooth.h> #include "qlowenergycontrollernew.h" -#ifdef QT_BLUEZ_BLUETOOTH +#if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE) #include <QtBluetooth/QBluetoothSocket> -#include <QtBluetooth/qbluetooth.h> #endif typedef QPair<QLowEnergyHandle,QLowEnergyHandle> HandlePair; @@ -63,7 +63,7 @@ public: : QObject(), state(QLowEnergyControllerNew::UnconnectedState), error(QLowEnergyControllerNew::NoError) -#ifdef QT_BLUEZ_BLUETOOTH +#if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE) , l2cpSocket(0) #endif {} @@ -89,7 +89,7 @@ private: // list of all found service uuids QMap<QBluetoothUuid, HandlePair> serviceList; -#ifdef QT_BLUEZ_BLUETOOTH +#if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE) QBluetoothSocket *l2cpSocket; void sendReadByGroupRequest(QLowEnergyHandle start, QLowEnergyHandle end); |