diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-05-19 09:05:48 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-05-19 09:06:07 +0200 |
| commit | ca5490859338f28e30104668a353275d23df1ec6 (patch) | |
| tree | 98df1ca5a4cb3852f03496bb0bf4e13d838063a2 /src/bluetooth/qbluetoothdevicediscoveryagent_p.h | |
| parent | 4976498621fb05804201dad52eab2c59d94f0da3 (diff) | |
| parent | 4593b79d84b9c8cc818d3c30e3882d699228339f (diff) | |
Merge remote-tracking branch 'gerrit/5.9' into btle
Change-Id: Ic8a6a7f8bf36b5604ec758e89091a04e60df993a
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 06cf29c2..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; @@ -161,11 +161,14 @@ private: #ifdef QT_WINRT_BLUETOOTH private slots: - void onListInitializationCompleted(); + void registerDevice(const QBluetoothDeviceInfo &info); + void onScanFinished(); + void onScanCanceled(); private: void disconnectAndClearWorker(); QPointer<QWinRTBluetoothDeviceDiscoveryWorker> worker; + QTimer *leScanTimer; #endif int lowEnergySearchTimeout; |