Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl

Change-Id: I4d53774cfe0783f50a123158d8bac7a02c382968

1 files changed, 21 insertions, 0 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
index d9883d28..a5cb034a 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
@@ -144,6 +144,8 @@ bool QBluetoothDeviceDiscoveryAgentPrivate::isActive() const
 
 void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent::DiscoveryMethods methods)
 {
+    using namespace OSXBluetooth;
+
     Q_ASSERT(!isActive());
     Q_ASSERT(lastError != QBluetoothDeviceDiscoveryAgent::InvalidBluetoothAdapterError);
     Q_ASSERT(methods & (QBluetoothDeviceDiscoveryAgent::ClassicMethod
@@ -157,6 +159,25 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
     }
 #endif // Q_OS_MACOS
 
+    // To be able to scan for devices, iOS requires Info.plist containing
+    // NSBluetoothAlwaysUsageDescription entry with a string, explaining
+    // the usage of Bluetooth interface. macOS also requires this description,
+    // starting from Monterey.
+
+    // No Classic on iOS, and Classic does not require a description on macOS:
+    if (methods.testFlag(QBluetoothDeviceDiscoveryAgent::LowEnergyMethod)
+        && qt_appNeedsBluetoothUsageDescription()
+        && !qt_appPlistContainsDescription(bluetoothUsageKey)) {
+        // This would result in Bluetooth framework throwing an exception
+        // the moment we try to start device discovery.
+        qCWarning(QT_BT_OSX)
+                << "A proper Info.plist with NSBluetoothAlwaysUsageDescription "
+                   "entry is required, cannot start device discovery";
+        setError(QBluetoothDeviceDiscoveryAgent::UnsupportedDiscoveryMethod);
+        emit q_ptr->error(lastError);
+        return;
+    }
+
     requestedMethods = methods;
 
     if (stopPending) {