Merge remote-tracking branch 'gerrit/dev' into btle

Adds the minimum compile requirements for the new
QBluetoothDeviceDiscoveryAgent API.

Change-Id: Idfe07bee63de9d2849ab68eb455d0be470591795

1 files changed, 3 insertions, 1 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index c8b15510..06cf29c2 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -99,7 +99,7 @@ public:
             QBluetoothDeviceDiscoveryAgent *parent);
     ~QBluetoothDeviceDiscoveryAgentPrivate();
 
-    void start();
+    void start(QBluetoothDeviceDiscoveryAgent::DiscoveryMethods methods);
     void stop();
     bool isActive() const;
 
@@ -168,6 +168,8 @@ private:
     QPointer<QWinRTBluetoothDeviceDiscoveryWorker> worker;
 #endif
 
+    int lowEnergySearchTimeout;
+    QBluetoothDeviceDiscoveryAgent::DiscoveryMethods requestedMethods;
     QBluetoothDeviceDiscoveryAgent *q_ptr;
 };