1 files changed, 29 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
index c17221be..41410b70 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -72,7 +72,21 @@ class QXmlStreamReader;
 QT_END_NAMESPACE
 #endif
 
-#ifdef QT_WINRT_BLUETOOTH
+#ifdef QT_WIN_BLUETOOTH
+#include <QtCore/QVariant>
+
+QT_BEGIN_NAMESPACE
+class QThread;
+
+class ThreadWorkerFind : public QObject
+{
+    Q_OBJECT
+signals:
+    void findFinished(QVariant result);
+};
+QT_END_NAMESPACE
+
+#elif defined(QT_WINRT_BLUETOOTH)
 #include <QtCore/QPointer>
 #endif
 
@@ -96,7 +110,7 @@ class QWinRTBluetoothServiceDiscoveryWorker;
 #endif
 
 class QBluetoothServiceDiscoveryAgentPrivate
-#if defined QT_WINRT_BLUETOOTH
+#if defined QT_WINRT_BLUETOOTH || defined QT_WIN_BLUETOOTH
         : public QObject
 {
     Q_OBJECT
@@ -157,6 +171,10 @@ public:
     void _q_fetchUuidsTimeout();
     void _q_hostModeStateChanged(QBluetoothLocalDevice::HostMode state);
 #endif
+#ifdef QT_WIN_BLUETOOTH
+    void _q_nextSdpScan(const QVariant &input);
+    bool serviceMatches(const QBluetoothServiceInfo &info);
+#endif
 
 private:
     void start(const QBluetoothAddress &address);
@@ -208,6 +226,15 @@ private:
     QMap<QBluetoothAddress,QPair<QBluetoothDeviceInfo,QList<QBluetoothUuid> > > sdpCache;
 #endif
 
+#ifdef QT_WIN_BLUETOOTH
+private:
+    bool pendingStop;
+    bool pendingFinish;
+
+    QThread *threadFind = nullptr;
+    ThreadWorkerFind *threadWorkerFind = nullptr;
+#endif
+
 #ifdef QT_WINRT_BLUETOOTH
 private slots:
     void processFoundService(quint64 deviceAddress, const QBluetoothServiceInfo &info);