diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:36:00 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:36:00 +0100 |
| commit | c0e4db036dfecc4216ca28b4af609ba940b53d0f (patch) | |
| tree | a214ad93cd7183fabfcb0d9199657533ab9454f3 /src/bluetooth/qbluetoothservicediscoveryagent.cpp | |
| parent | 49f098f6481213ca05b453e0acfd0102cd1a71f4 (diff) | |
| parent | 02a74dcea028f42d481774134a8b5915212e4c17 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ic9e5cb3989426b90f6dad58d53dba366638ff35f
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index 98c02d19..eec9894f 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -456,8 +456,6 @@ void QBluetoothServiceDiscoveryAgentPrivate::startServiceDiscovery() { Q_Q(QBluetoothServiceDiscoveryAgent); - setDiscoveryState(ServiceDiscovery); - if (discoveredDevices.isEmpty()) { setDiscoveryState(Inactive); emit q->finished(); |