diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-13 14:27:55 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-13 14:27:55 +0200 |
| commit | 20949d791463e571bd3a8549933b5b91019f754f (patch) | |
| tree | 1dcd9c0c3833aeba40f074b8b26da3656868fa54 /src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp | |
| parent | da0973e98ebd0d81523839ea255015c4a2e646a7 (diff) | |
| parent | 1de888375e3bafb44c9cc8dafce68e2b6b4f7a48 (diff) | |
Merge remote-tracking branch 'gerrit/dev' into btle
Adds the minimum compile requirements for the new
QBluetoothDeviceDiscoveryAgent API.
Change-Id: Idfe07bee63de9d2849ab68eb455d0be470591795
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp index f8a5fca1..bfa39fc1 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp @@ -287,6 +287,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate( : inquiryType(QBluetoothDeviceDiscoveryAgent::GeneralUnlimitedInquiry), lastError(QBluetoothDeviceDiscoveryAgent::NoError), + lowEnergySearchTimeout(-1), // TODO q_ptr(parent) { Q_UNUSED(deviceAdapter); @@ -302,7 +303,12 @@ bool QBluetoothDeviceDiscoveryAgentPrivate::isActive() const return worker; } -void QBluetoothDeviceDiscoveryAgentPrivate::start() +QBluetoothDeviceDiscoveryAgent::DiscoveryMethods QBluetoothDeviceDiscoveryAgent::supportedDiscoveryMethods() +{ + return (ClassicMethod | LowEnergyMethod); +} + +void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent::DiscoveryMethods) { if (worker) return; |