diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-11-13 15:39:26 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-11-13 15:39:26 +0100 |
| commit | a3c295297a4ee1365619cc49f504a9f35b4f7785 (patch) | |
| tree | a40a5ef9b0664ea4e27dc1c27116f8f7efcb364f /src/bluetooth/qbluetoothdevicediscoveryagent_p.h | |
| parent | 020e9115392a31b55c7340dbb9c8cfac8a528b35 (diff) | |
| parent | 720137353b3d6ecb6a07d1f5486ab20306be8134 (diff) | |
Merge branch 'dev' into wip/win
Conflicts:
src/bluetooth/bluetooth.pro
src/bluetooth/qbluetoothlocaldevice_p.h
Change-Id: Ic50580a3828e6c1f7c71fc79e1247df73cc1ecb7
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 1afbc6bb..f224fe41 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -50,6 +50,7 @@ #ifdef QT_ANDROID_BLUETOOTH #include <QtAndroidExtras/QAndroidJniObject> #include "android/devicediscoverybroadcastreceiver_p.h" +#include <QtCore/QTimer> #endif #include <QtCore/QVariantMap> @@ -131,14 +132,20 @@ private: #ifdef QT_ANDROID_BLUETOOTH private slots: - void processDiscoveryFinished(); - void processDiscoveredDevices(const QBluetoothDeviceInfo &info); + void processSdpDiscoveryFinished(); + void processDiscoveredDevices(const QBluetoothDeviceInfo &info, bool isLeResult); + friend void QtBluetoothLE_leScanResult(JNIEnv *, jobject, jlong, jobject); + void stopLowEnergyScan(); private: + void startLowEnergyScan(); + DeviceDiscoveryBroadcastReceiver *receiver; QBluetoothAddress m_adapterAddress; - bool m_active; + short m_active; QAndroidJniObject adapter; + QAndroidJniObject leScanner; + QTimer *leScanTimeout; bool pendingCancel, pendingStart; #elif defined(QT_BLUEZ_BLUETOOTH) |