summaryrefslogtreecommitdiff
path: root/src/bluetooth/qbluetoothservicediscoveryagent_p.h
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2017-04-05 16:01:38 +0200
committerAlex Blasche <alexander.blasche@qt.io>2017-04-06 07:31:45 +0000
commitba56814fa4f0ca4a20d8448dcee95e5bf7c9d3a5 (patch)
tree571c61765ff6a1f75a4fc6e37a8cc54636c57fad /src/bluetooth/qbluetoothservicediscoveryagent_p.h
parentcda661e1446d4ad00390dacdff8eb107a13d636b (diff)
downloadqtconnectivity-ba56814fa4f0ca4a20d8448dcee95e5bf7c9d3a5.tar.gz
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/qbluetoothservicediscoveryagent_p.h')
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
index ef5db720..9a8da5e3 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -59,7 +59,7 @@
#include <QStack>
#include <QStringList>
-#ifdef QT_BLUEZ_BLUETOOTH
+#if QT_CONFIG(bluez)
class OrgBluezManagerInterface;
class OrgBluezAdapterInterface;
class OrgBluezDeviceInterface;
@@ -122,7 +122,7 @@ public:
void _q_deviceDiscovered(const QBluetoothDeviceInfo &info);
void _q_serviceDiscoveryFinished();
void _q_deviceDiscoveryError(QBluetoothDeviceDiscoveryAgent::Error);
-#ifdef QT_BLUEZ_BLUETOOTH
+#if QT_CONFIG(bluez)
void _q_discoveredServices(QDBusPendingCallWatcher *watcher);
void _q_createdDevice(QDBusPendingCallWatcher *watcher);
void _q_foundDevice(QDBusPendingCallWatcher *watcher);
@@ -151,7 +151,7 @@ private:
void stop();
bool isDuplicatedService(const QBluetoothServiceInfo &serviceInfo) const;
-#ifdef QT_BLUEZ_BLUETOOTH
+#if QT_CONFIG(bluez)
void startBluez5(const QBluetoothAddress &address);
void runExternalSdpScan(const QBluetoothAddress &remoteAddress,
const QBluetoothAddress &localAddress);
@@ -179,7 +179,7 @@ private:
QBluetoothServiceDiscoveryAgent::DiscoveryMode mode;
bool singleDevice;
-#ifdef QT_BLUEZ_BLUETOOTH
+#if QT_CONFIG(bluez)
QString foundHostAdapterPath;
OrgBluezManagerInterface *manager;
OrgFreedesktopDBusObjectManagerInterface *managerBluez5;