1 files changed, 67 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 97beced3..be3a8863 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -59,6 +59,11 @@
 #include <QtCore/QTimer>
 #endif
 
+#ifdef Q_OS_DARWIN
+#include "osx/btdelegates_p.h"
+#include "osx/btraii_p.h"
+#endif // Q_OS_DARWIN
+
 #include <QtCore/QVariantMap>
 
 #include <QtBluetooth/QBluetoothAddress>
@@ -95,6 +100,9 @@ QT_END_NAMESPACE
 #elif defined(QT_WINRT_BLUETOOTH)
 #include <QtCore/QPointer>
 #include <QtCore/QTimer>
+
+using ManufacturerData = QHash<quint16, QByteArray>;
+Q_DECLARE_METATYPE(ManufacturerData)
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -104,11 +112,15 @@ class QWinRTBluetoothDeviceDiscoveryWorker;
 #endif
 
 class QBluetoothDeviceDiscoveryAgentPrivate
-#if defined(QT_ANDROID_BLUETOOTH) || defined(QT_WINRT_BLUETOOTH) || defined(QT_WIN_BLUETOOTH)
+#if defined(QT_ANDROID_BLUETOOTH) || defined(QT_WINRT_BLUETOOTH) || defined(QT_WIN_BLUETOOTH) \
+            || defined(Q_OS_DARWIN)
     : public QObject
+#if defined(Q_OS_MACOS)
+    , public DarwinBluetooth::DeviceInquiryDelegate
+#endif // Q_OS_MACOS
 {
     Q_OBJECT
-#else
+#else // BlueZ
 {
 #endif
     Q_DECLARE_PUBLIC(QBluetoothDeviceDiscoveryAgent)
@@ -208,6 +220,8 @@ private:
 #ifdef QT_WINRT_BLUETOOTH
 private slots:
     void registerDevice(const QBluetoothDeviceInfo &info);
+    void updateDeviceData(const QBluetoothAddress &address, QBluetoothDeviceInfo::Fields fields,
+                          qint16 rssi, ManufacturerData manufacturerData);
     void onScanFinished();
 
 private:
@@ -216,6 +230,57 @@ private:
     QTimer *leScanTimer;
 #endif
 
+#ifdef Q_OS_DARWIN
+
+    void startLE();
+
+#ifdef Q_OS_MACOS
+
+    void startClassic();
+
+    // Classic (IOBluetooth) inquiry delegate's methods:
+    void inquiryFinished() override;
+    void error(IOReturn error) override;
+    void classicDeviceFound(void *device) override;
+    // Classic (IOBluetooth) errors:
+    void setError(IOReturn error, const QString &text = QString());
+
+#endif // Q_OS_MACOS
+
+    // LE scan delegates (CoreBluetooth, all Darwin OSes):
+    void LEinquiryFinished();
+    void LEinquiryError(QBluetoothDeviceDiscoveryAgent::Error error);
+    void LEnotSupported();
+
+    // LE errors:
+    void setError(QBluetoothDeviceDiscoveryAgent::Error,
+                  const QString &text = QString());
+
+    // Both LE and Classic devices go there:
+    void deviceFound(const QBluetoothDeviceInfo &newDeviceInfo);
+
+    enum AgentState {
+        NonActive,
+        ClassicScan, // macOS (IOBluetooth) only
+        LEScan
+    } agentState;
+
+    QBluetoothAddress adapterAddress;
+
+    bool startPending;
+    bool stopPending;
+
+#ifdef Q_OS_MACOS
+
+    DarwinBluetooth::ScopedPointer controller;
+    DarwinBluetooth::ScopedPointer inquiry;
+
+#endif // Q_OS_MACOS
+
+    DarwinBluetooth::ScopedPointer inquiryLE;
+
+#endif // Q_OS_DARWIN
+
     int lowEnergySearchTimeout;
     QBluetoothDeviceDiscoveryAgent::DiscoveryMethods requestedMethods;
     QBluetoothDeviceDiscoveryAgent *q_ptr;