diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-04-05 16:01:38 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-04-06 07:31:45 +0000 |
| commit | ba56814fa4f0ca4a20d8448dcee95e5bf7c9d3a5 (patch) | |
| tree | 571c61765ff6a1f75a4fc6e37a8cc54636c57fad /src/bluetooth/qbluetoothdevicediscoveryagent_p.h | |
| parent | cda661e1446d4ad00390dacdff8eb107a13d636b (diff) | |
Replace custom QT_BLUEZ_BLUETOOTH against the related feature define
Change-Id: I4fbb948841a610640acaf87364e2157e31782836
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index de8006be..45764c1a 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -63,7 +63,7 @@ #include <QtBluetooth/QBluetoothAddress> #include <QtBluetooth/QBluetoothLocalDevice> -#ifdef QT_BLUEZ_BLUETOOTH +#if QT_CONFIG(bluez) #include "bluez/bluez5_helper_p.h" class OrgBluezManagerInterface; @@ -103,7 +103,7 @@ public: void stop(); bool isActive() const; -#ifdef QT_BLUEZ_BLUETOOTH +#if QT_CONFIG(bluez) void _q_deviceFound(const QString &address, const QVariantMap &dict); void _q_propertyChanged(const QString &name, const QDBusVariant &value); void _q_InterfacesAdded(const QDBusObjectPath &object_path, @@ -141,7 +141,7 @@ private: QTimer *leScanTimeout; bool pendingCancel, pendingStart; -#elif defined(QT_BLUEZ_BLUETOOTH) +#elif QT_CONFIG(bluez) QBluetoothAddress m_adapterAddress; bool pendingCancel; bool pendingStart; |