diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:13 +0200 |
| commit | a39f4c849bcc3c3cc2d48639d30c0f99e36009e0 (patch) | |
| tree | 7848c6be826a3e10c96eea5f182b7a20dfd73c71 /src/bluetooth/qlowenergycontroller_p.h | |
| parent | 61de2a96250ec140233b96f81b1bbb015dad48dc (diff) | |
| parent | 5391a325eadcee86a494aa96a3f8edae1be55556 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I97e00dacff4ec6b01937383efa6a6e6254fb8f87
Diffstat (limited to 'src/bluetooth/qlowenergycontroller_p.h')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h index ad978ce1..1e5e038c 100644 --- a/src/bluetooth/qlowenergycontroller_p.h +++ b/src/bluetooth/qlowenergycontroller_p.h @@ -77,7 +77,7 @@ QT_END_NAMESPACE #include "qlowenergycontroller.h" #include "qlowenergyserviceprivate_p.h" -#if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE) +#if QT_CONFIG(bluez) && !defined(QT_BLUEZ_NO_BTLE) #include <QtBluetooth/QBluetoothSocket> #elif defined(QT_ANDROID_BLUETOOTH) #include <QtAndroidExtras/QAndroidJniObject> @@ -96,7 +96,7 @@ QT_BEGIN_NAMESPACE class QLowEnergyServiceData; class QTimer; -#if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE) +#if QT_CONFIG(bluez) && !defined(QT_BLUEZ_NO_BTLE) class HciManager; class LeCmacCalculator; class QSocketNotifier; @@ -209,7 +209,7 @@ public: QLowEnergyController::RemoteAddressType addressType; private: -#if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE) +#if QT_CONFIG(bluez) && !defined(QT_BLUEZ_NO_BTLE) quint16 connectionHandle = 0; QBluetoothSocket *l2cpSocket; struct Request { |