13 files changed, 555 insertions, 27 deletions

diff --git a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
index 6c548f84..9f10c32a 100644
--- a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
+++ b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
@@ -1,6 +1,6 @@
 /****************************************************************************
  **
- ** Copyright (C) 2016 The Qt Company Ltd.
+ ** Copyright (C) 2019 The Qt Company Ltd.
  ** Contact: https://www.qt.io/licensing/
  **
  ** This file is part of the QtBluetooth module of the Qt Toolkit.
@@ -47,6 +47,11 @@ import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
 import android.bluetooth.BluetoothProfile;
+import android.bluetooth.le.BluetoothLeScanner;
+import android.bluetooth.le.ScanCallback;
+import android.bluetooth.le.ScanFilter;
+import android.bluetooth.le.ScanResult;
+import android.bluetooth.le.ScanSettings;
 import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
@@ -90,6 +95,9 @@ public class QtBluetoothLE {
     private final int RUNNABLE_TIMEOUT = 3000; // 3 seconds
     private final Handler timeoutHandler = new Handler(Looper.getMainLooper());
 
+    /* New BTLE scanner setup since Android SDK v21 */
+    private BluetoothLeScanner mBluetoothLeScanner = null;
+
     private class TimeoutRunnable implements Runnable {
         public TimeoutRunnable(int handle) { pendingJobHandle = handle; }
         @Override
@@ -123,6 +131,7 @@ public class QtBluetoothLE {
     @SuppressWarnings("WeakerAccess")
     public QtBluetoothLE() {
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mBluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
     }
 
     public QtBluetoothLE(final String remoteAddress, Context context) {
@@ -131,7 +140,6 @@ public class QtBluetoothLE {
         mRemoteGattAddress = remoteAddress;
     }
 
-
     /*************************************************************/
     /* Device scan                                               */
     /*************************************************************/
@@ -144,27 +152,45 @@ public class QtBluetoothLE {
             return true;
 
         if (isEnabled) {
-            mLeScanRunning = mBluetoothAdapter.startLeScan(leScanCallback);
+            Log.d(TAG, "New BTLE scanning API");
+            ScanSettings.Builder settingsBuilder = new ScanSettings.Builder();
+            settingsBuilder = settingsBuilder.setScanMode(ScanSettings.SCAN_MODE_BALANCED);
+            ScanSettings settings = settingsBuilder.build();
+
+            List<ScanFilter> filterList = new ArrayList<ScanFilter>(2);
+
+            mBluetoothLeScanner.startScan(filterList, settings, leScanCallback21);
+            mLeScanRunning = true;
         } else {
-            mBluetoothAdapter.stopLeScan(leScanCallback);
+            mBluetoothLeScanner.stopScan(leScanCallback21);
             mLeScanRunning = false;
         }
 
         return (mLeScanRunning == isEnabled);
     }
 
-    // Device scan callback
-    private final BluetoothAdapter.LeScanCallback leScanCallback =
-            new BluetoothAdapter.LeScanCallback() {
+    // Device scan callback (SDK v21+)
+    private final ScanCallback leScanCallback21 = new ScanCallback() {
+        @Override
+        public void onScanResult(int callbackType, ScanResult result) {
+            super.onScanResult(callbackType, result);
+            leScanResult(qtObject, result.getDevice(), result.getRssi(), result.getScanRecord().getBytes());
+        }
 
-                @Override
-                public void onLeScan(final BluetoothDevice device, int rssi, byte[] scanRecord) {
-                    if (qtObject == 0)
-                        return;
+        @Override
+        public void onBatchScanResults(List<ScanResult> results) {
+            super.onBatchScanResults(results);
+            for (ScanResult result : results)
+                leScanResult(qtObject, result.getDevice(), result.getRssi(), result.getScanRecord().getBytes());
 
-                    leScanResult(qtObject, device, rssi, scanRecord);
-                }
-            };
+        }
+
+        @Override
+        public void onScanFailed(int errorCode) {
+            super.onScanFailed(errorCode);
+            Log.d(TAG, "BTLE device scan failed with " + errorCode);
+        }
+    };
 
     public native void leScanResult(long qtObject, BluetoothDevice device, int rssi, byte[] scanRecord);
 
diff --git a/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp b/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp
index 99245af3..f1f50516 100644
--- a/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp
+++ b/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp
@@ -516,7 +516,7 @@ QBluetoothDeviceInfo DeviceDiscoveryBroadcastReceiver::retrieveDeviceInfo(JNIEnv
         const char *scanRecordBuffer = reinterpret_cast<const char *>(elems);
         const int scanRecordLength = env->GetArrayLength(scanRecord);
 
-        QList<QBluetoothUuid> serviceUuids;
+        QVector<QBluetoothUuid> serviceUuids;
         int i = 0;
 
         // Spec 4.2, Vol 3, Part C, Chapter 11
@@ -567,7 +567,7 @@ QBluetoothDeviceInfo DeviceDiscoveryBroadcastReceiver::retrieveDeviceInfo(JNIEnv
                 serviceUuids.append(foundService);
         }
 
-        info.setServiceUuids(serviceUuids, QBluetoothDeviceInfo::DataIncomplete);
+        info.setServiceUuids(serviceUuids);
 
         env->ReleaseByteArrayElements(scanRecord, elems, JNI_ABORT);
     }
diff --git a/src/bluetooth/osx/btdelegates.cpp b/src/bluetooth/osx/btdelegates.cpp
new file mode 100644
index 00000000..c86516f9
--- /dev/null
+++ b/src/bluetooth/osx/btdelegates.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtBluetooth module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "btdelegates_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace DarwinBluetooth {
+
+DeviceInquiryDelegate::~DeviceInquiryDelegate()
+{
+}
+
+PairingDelegate::~PairingDelegate()
+{
+}
+
+SDPInquiryDelegate::~SDPInquiryDelegate()
+{
+}
+
+ChannelDelegate::~ChannelDelegate()
+{
+}
+
+ConnectionMonitor::~ConnectionMonitor()
+{
+}
+
+SocketListener::~SocketListener()
+{
+}
+
+} // namespace DarwinBluetooth
+
+QT_END_NAMESPACE
diff --git a/src/bluetooth/osx/btdelegates_p.h b/src/bluetooth/osx/btdelegates_p.h
new file mode 100644
index 00000000..cb29b87e
--- /dev/null
+++ b/src/bluetooth/osx/btdelegates_p.h
@@ -0,0 +1,155 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtBluetooth module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BTDELEGATES_P_H
+#define BTDELEGATES_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qbluetoothdevicediscoveryagent.h"
+#include "qlowenergycontroller.h"
+#include "qbluetooth.h"
+
+#include <QtCore/qsharedpointer.h>
+#include <QtCore/qglobal.h>
+
+#if defined(Q_OS_MACOS) || defined(Q_OS_IOS)
+#include <IOKit/IOReturn.h>
+#endif
+
+#include <cstdint>
+
+QT_BEGIN_NAMESPACE
+
+class QLowEnergyServicePrivate;
+class QBluetoothAddress;
+class QByteArray;
+
+namespace DarwinBluetooth {
+
+#if defined(Q_OS_MACOS)
+
+class DeviceInquiryDelegate
+{
+public:
+    virtual ~DeviceInquiryDelegate();
+
+    virtual void inquiryFinished() = 0;
+    virtual void error(IOReturn error) = 0;
+    virtual void deviceFound(void *ioBluetoothDevice) = 0;
+};
+
+class PairingDelegate
+{
+public:
+    using BluetoothNumericValue = uint32_t;
+    using BluetoothPasskey = BluetoothNumericValue;
+
+    virtual ~PairingDelegate();
+
+    virtual void connecting(void *pair) = 0;
+    virtual void requestPIN(void *pair) = 0;
+    virtual void requestUserConfirmation(void *pair,
+                                         BluetoothNumericValue) = 0;
+    virtual void passkeyNotification(void *pair,
+                                     BluetoothPasskey passkey) = 0;
+    virtual void error(void *pair, IOReturn errorCode) = 0;
+    virtual void pairingFinished(void *pair) = 0;
+};
+
+class SDPInquiryDelegate {
+public:
+    virtual ~SDPInquiryDelegate();
+
+    virtual void SDPInquiryFinished(void *ioBluetoothDevice) = 0;
+    virtual void SDPInquiryError(void *ioBluetoothDevice, IOReturn errorCode) = 0;
+};
+
+// L2CAP and RFCOMM.
+class ChannelDelegate
+{
+public:
+    virtual ~ChannelDelegate();
+
+    virtual void setChannelError(IOReturn errorCode) = 0;
+    virtual void channelOpenComplete() = 0;
+    virtual void channelClosed() = 0;
+
+    virtual void readChannelData(void *data, std::size_t size) = 0;
+    virtual void writeComplete() = 0;
+};
+
+class ConnectionMonitor {
+public:
+    virtual ~ConnectionMonitor();
+
+    virtual void deviceConnected(const QBluetoothAddress &address) = 0;
+    virtual void deviceDisconnected(const QBluetoothAddress &address) = 0;
+};
+
+class SocketListener
+{
+public:
+    virtual ~SocketListener();
+
+    virtual void openNotifyRFCOMM(void *rfcommChannel) = 0;
+    virtual void openNotifyL2CAP(void *l2capChannel) = 0;
+};
+
+#else
+
+#error "This header is only for macOS (Bluetooth Classic only)"
+
+#endif // Q_OS_MACOS
+
+
+} // namespace DarwinBluetooth
+
+QT_END_NAMESPACE
+
+#endif // DARWINBTDELEGATES_P_H
diff --git a/src/bluetooth/osx/btraii.mm b/src/bluetooth/osx/btraii.mm
new file mode 100644
index 00000000..a1bf2a8d
--- /dev/null
+++ b/src/bluetooth/osx/btraii.mm
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtBluetooth module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "btraii_p.h"
+
+#include <qdebug.h>
+
+#include <Foundation/Foundation.h>
+
+#include <utility>
+
+QT_BEGIN_NAMESPACE
+
+namespace DarwinBluetooth {
+
+StrongReference::StrongReference(void *object, RetainPolicy policy)
+    : objCInstance(object)
+{
+    if (policy == RetainPolicy::doInitialRetain)
+        objCInstance = [getAs<NSObject>() retain];
+}
+
+StrongReference::StrongReference(const StrongReference &other)
+{
+    objCInstance = [other.getAs<NSObject>() retain];
+}
+
+StrongReference::StrongReference(StrongReference &&other)
+{
+    std::swap(objCInstance, other.objCInstance);
+}
+
+StrongReference::~StrongReference()
+{
+    [getAs<NSObject>() release];
+}
+
+StrongReference &StrongReference::operator = (const StrongReference &other) noexcept
+{
+    if (this != &other) {
+        [getAs<NSObject>() release];
+        objCInstance = [other.getAs<NSObject>() retain];
+    }
+
+    return *this;
+}
+
+StrongReference &StrongReference::operator = (StrongReference &&other) noexcept
+{
+    swap(other);
+    return *this;
+}
+
+void StrongReference::reset()
+{
+    [getAs<NSObject>() release];
+    objCInstance = nullptr;
+}
+
+void StrongReference::reset(void *obj, RetainPolicy policy)
+{
+    [getAs<NSObject>() release];
+    objCInstance = obj;
+
+    if (policy == RetainPolicy::doInitialRetain) {
+        auto newInstance = static_cast<NSObject *>(obj);
+        Q_ASSERT(newInstance);
+        objCInstance = [newInstance retain];
+    }
+}
+
+} // namespace DarwinBluetooth
+
+QT_END_NAMESPACE
diff --git a/src/bluetooth/osx/btraii_p.h b/src/bluetooth/osx/btraii_p.h
new file mode 100644
index 00000000..b64defb6
--- /dev/null
+++ b/src/bluetooth/osx/btraii_p.h
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtBluetooth module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BTRAII_P_H
+#define BTRAII_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+
+#include <utility>
+
+QT_BEGIN_NAMESPACE
+
+namespace DarwinBluetooth {
+
+enum class RetainPolicy
+{
+    noInitialRetain,
+    doInitialRetain
+};
+
+// The class StrongReference and its descendant ScopedGuard
+// are RAII classes dealing with raw pointers to NSObject class
+// and its descendants (and thus hiding Objective-C's retain/
+// release semantics). The header itself is meant to be included
+// into *.cpp files so it's a pure C++ code without any Objective-C
+// syntax. Thus it's a bit clunky - the type information is 'erased'
+// and has to be enforced by the code using these smart pointers.
+// That's because these types are Objective-C classes - thus require
+// Objective-C compiler to work. Member-function template 'getAs' is
+// a convenience shortcut giving the desired pointer type in
+// Objective-C++ files (*.mm).
+
+// TODO: on top of these classes I can build ObjCStrongReference (it's
+// now inside osxbtutils_p.h, a template class that does have type
+// information needed but works only in Objective-C++ environment.
+class StrongReference
+{
+public:
+    StrongReference() = default;
+    StrongReference(void *object, RetainPolicy policy);
+    StrongReference(const StrongReference &other);
+    StrongReference(StrongReference &&other);
+
+    ~StrongReference();
+
+    StrongReference &operator = (const StrongReference &other) noexcept;
+    StrongReference &operator = (StrongReference &&other) noexcept;
+
+    void swap(StrongReference &other) noexcept
+    {
+        std::swap(objCInstance, other.objCInstance);
+    }
+
+    void reset();
+    void reset(void *newInstance, RetainPolicy policy);
+
+    template<class ObjCType>
+    ObjCType *getAs() const
+    {
+        return static_cast<ObjCType *>(objCInstance);
+    }
+
+private:
+    void *objCInstance = nullptr;
+};
+
+class ScopedPointer final : public StrongReference
+{
+public:
+    ScopedPointer() = default;
+    ScopedPointer(void *instance, RetainPolicy policy)
+        : StrongReference(instance, policy)
+    {
+    }
+
+private:
+    Q_DISABLE_COPY_MOVE(ScopedPointer)
+};
+
+} // namespace DarwinBluetooth
+
+QT_END_NAMESPACE
+
+#endif // BTRAII_P_H
diff --git a/src/bluetooth/osx/osxbt.pri b/src/bluetooth/osx/osxbt.pri
index b7ac0535..ae6111ee 100644
--- a/src/bluetooth/osx/osxbt.pri
+++ b/src/bluetooth/osx/osxbt.pri
@@ -21,7 +21,9 @@ CONFIG(osx) {
                        osx/osxbluetooth_p.h \
                        osx/osxbtcentralmanager_p.h \
                        osx/osxbtnotifier_p.h \
-                       osx/osxbtperipheralmanager_p.h
+                       osx/osxbtperipheralmanager_p.h \
+                       osx/btraii_p.h \
+                       osx/btdelegates_p.h
 
     OBJECTIVE_SOURCES += osx/osxbtutility.mm \
                          osx/osxbtdevicepair.mm \
@@ -36,7 +38,9 @@ CONFIG(osx) {
                          osx/osxbtobexsession.mm \
                          osx/osxbtledeviceinquiry.mm \
                          osx/osxbtcentralmanager.mm \
-                         osx/osxbtperipheralmanager.mm
+                         osx/osxbtperipheralmanager.mm \
+                         osx/btraii.mm
+    SOURCES += osx/btdelegates.cpp
 } else {
     PRIVATE_HEADERS += osx/osxbtutility_p.h \
                        osx/osxbtledeviceinquiry_p.h \
diff --git a/src/bluetooth/osx/osxbtnotifier_p.h b/src/bluetooth/osx/osxbtnotifier_p.h
index dca6c268..397214d0 100644
--- a/src/bluetooth/osx/osxbtnotifier_p.h
+++ b/src/bluetooth/osx/osxbtnotifier_p.h
@@ -96,7 +96,6 @@ Q_SIGNALS:
     void CBManagerError(QLowEnergyController::Error error);
     void CBManagerError(const QBluetoothUuid &serviceUuid, QLowEnergyController::Error error);
     void CBManagerError(const QBluetoothUuid &serviceUuid, QLowEnergyService::ServiceError error);
-
 };
 
 }
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
index 443be14d..2f0524d4 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
@@ -363,7 +363,8 @@ void QBluetoothDeviceDiscoveryAgentPrivate::processDiscoveredDevices(
 
     discoveredDevices.append(info);
     qCDebug(QT_BT_ANDROID) << "Device found: " << info.name() << info.address().toString()
-                           << "isLeScanResult:" << isLeResult;
+                           << "isLeScanResult:" << isLeResult
+                           << "Manufacturer data size:" << info.manufacturerData().size();
     emit q->deviceDiscovered(info);
 }
 
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
index 177b8082..9d306053 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
@@ -758,13 +758,13 @@ HRESULT QWinRTBluetoothDeviceDiscoveryWorker::onBluetoothLEDeviceFound(ComPtr<IB
     boolean isPaired;
     hr = pairing->get_IsPaired(&isPaired);
     Q_ASSERT_SUCCEEDED(hr);
-    QList<QBluetoothUuid> uuids;
+    QVector<QBluetoothUuid> uuids;
 
     const LEAdvertisingInfo adInfo = m_foundLEDevicesMap.value(address);
     const qint16 rssi = adInfo.rssi;
     // Use the services obtained from the advertisement data if the device is not paired
     if (!isPaired) {
-        uuids = adInfo.services.toList();
+        uuids = adInfo.services;
     } else {
         IVectorView <GenericAttributeProfile::GattDeviceService *> *deviceServices;
         hr = device->get_GattServices(&deviceServices);
@@ -790,7 +790,7 @@ HRESULT QWinRTBluetoothDeviceDiscoveryWorker::onBluetoothLEDeviceFound(ComPtr<IB
 
     QBluetoothDeviceInfo info(QBluetoothAddress(address), btName, 0);
     info.setCoreConfigurations(QBluetoothDeviceInfo::LowEnergyCoreConfiguration);
-    info.setServiceUuids(uuids, QBluetoothDeviceInfo::DataIncomplete);
+    info.setServiceUuids(uuids);
     info.setRssi(rssi);
     for (quint16 key : manufacturerData.keys())
         info.setManufacturerData(key, manufacturerData.value(key));
diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp
index 8fc044fb..d8aa00d7 100644
--- a/src/bluetooth/qlowenergycontroller.cpp
+++ b/src/bluetooth/qlowenergycontroller.cpp
@@ -432,6 +432,29 @@ QLowEnergyController *QLowEnergyController::createCentral(const QBluetoothDevice
     return new QLowEnergyController(remoteDevice, parent);
 }
 
+/*!
+    Returns a new instance of this class with \a parent.
+
+    The \a remoteDevice must contain the address of the remote Bluetooth Low
+    Energy device to which this object should attempt to connect later on.
+
+    The connection is established via \a localDevice. If \a localDevice is invalid,
+    the local default device is automatically selected. If \a localDevice specifies
+    a local device that is not a local Bluetooth adapter, \l error() is set to
+    \l InvalidBluetoothAdapterError once \l connectToDevice() is called.
+
+    Note that specifying the local device to be used for the connection is only
+    possible when using BlueZ. All other platforms do not support this feature.
+
+    \since 5.13
+ */
+QLowEnergyController *QLowEnergyController::createCentral(const QBluetoothAddress &remoteDevice,
+                                                          const QBluetoothAddress &localDevice,
+                                                          QObject *parent)
+{
+    return new QLowEnergyController(remoteDevice, localDevice, parent);
+}
+
 
 /*!
    Returns a new object of this class that is in the \l PeripheralRole and has the
diff --git a/src/bluetooth/qlowenergycontroller.h b/src/bluetooth/qlowenergycontroller.h
index 9fe46fe5..5498d4a5 100644
--- a/src/bluetooth/qlowenergycontroller.h
+++ b/src/bluetooth/qlowenergycontroller.h
@@ -93,13 +93,16 @@ public:
     explicit QLowEnergyController(const QBluetoothAddress &remoteDevice,
                                   QObject *parent = nullptr); // TODO Qt 6 remove ctor
     explicit QLowEnergyController(const QBluetoothDeviceInfo &remoteDevice,
-                                  QObject *parent = nullptr);
+                                  QObject *parent = nullptr); // TODO Qt 6 make private
     explicit QLowEnergyController(const QBluetoothAddress &remoteDevice,
                                   const QBluetoothAddress &localDevice,
                                   QObject *parent = nullptr); // TODO Qt 6 remove ctor
 
     static QLowEnergyController *createCentral(const QBluetoothDeviceInfo &remoteDevice,
                                                QObject *parent = nullptr);
+    static QLowEnergyController *createCentral(const QBluetoothAddress &remoteDevice,
+                                               const QBluetoothAddress &localDevice,
+                                               QObject *parent = nullptr);
     static QLowEnergyController *createPeripheral(QObject *parent = nullptr);
 
     // TODO: Allow to set connection timeout (disconnect when no data has been exchanged for n seconds).
diff --git a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
index f019d9c2..4e5f3430 100644
--- a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
@@ -268,9 +268,13 @@ void QLowEnergyControllerPrivateBluezDBus::connectToDeviceHelper()
             const QVariantMap &ifaceValues = jt.value();
 
             if (iface == QStringLiteral("org.bluez.Device1")) {
-                if (remoteDevice.toString() == ifaceValues.value(QStringLiteral("Address")).toString()) {
-                    devicePath = it.key().path();
-                    break;
+                if (remoteDevice.toString() == ifaceValues.value(QStringLiteral("Address")).toString())
+                {
+                    const QVariant adapterForCurrentDevice = ifaceValues.value(QStringLiteral("Adapter"));
+                    if (qvariant_cast<QDBusObjectPath>(adapterForCurrentDevice).path() == hostAdapterPath) {
+                        devicePath = it.key().path();
+                        break;
+                    }
                 }
             }
         }