diff options
| author | Nedim Hadzic <nhadzic@blackberry.com> | 2013-08-27 17:36:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-29 11:53:28 +0200 |
| commit | be964e06352e8012d510d60a89949f573125a83d (patch) | |
| tree | 98f60052817622142377c223932da978e647af78 /src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp | |
| parent | 030a30e7485785c9d419c38f23c9d5dac2b4ce9a (diff) | |
Make Bluetooth adapter choosable for device search
In case there are more Bluetooth adapter, device search
might give different results.
Change-Id: Ideddb39460985c18547baec986b15e43946c85de
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp index f479b65e..46a6361b 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp @@ -52,8 +52,9 @@ QT_BEGIN_NAMESPACE_BLUETOOTH -QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate() - : lastError(QBluetoothDeviceDiscoveryAgent::NoError), pendingCancel(false), pendingStart(false), adapter(0) +QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(const QBluetoothAddress &address) + : lastError(QBluetoothDeviceDiscoveryAgent::NoError), m_deviceAddress(address), + pendingCancel(false), pendingStart(false), adapter(0) { manager = new OrgBluezManagerInterface(QLatin1String("org.bluez"), QLatin1String("/"), QDBusConnection::systemBus()); @@ -83,9 +84,14 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start() } discoveredDevices.clear(); + QDBusPendingReply<QDBusObjectPath> reply; - QDBusPendingReply<QDBusObjectPath> reply = manager->DefaultAdapter(); + if (m_deviceAddress.isNull()) + reply = manager->DefaultAdapter(); + else + reply = manager->FindAdapter(m_deviceAddress.toString()); reply.waitForFinished(); + if (reply.isError()) { errorString = reply.error().message(); #ifdef QT_DEVICEDISCOVERY_DEBUG |