diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-03 09:33:29 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-03 09:33:29 +0100 |
| commit | 5685d3b02fb448e74f319de0053e97fff265483a (patch) | |
| tree | dfd3f315bdbf633f6b3210aa07eea3ff51d56c89 /src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp | |
| parent | 0f700c166e7369230763a4c6dbc10e86944669a1 (diff) | |
| parent | 7d4f4c3083d565af00f1564ae80e5cbfbc338bd5 (diff) | |
Merge remote-tracking branch 'gerrit/stable' into dev
Conflicts:
src/bluetooth/qbluetoothservicediscoveryagent.cpp
Change-Id: I52831fc8c69062e90c003836fd9402f19d6a0ba5
Diffstat (limited to 'src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp')
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp index e39a26af..d0d6d7ee 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp @@ -372,11 +372,10 @@ void QDeclarativeBluetoothDiscoveryModel::setRunning(bool running) d->m_running = running; if (!running) { - if (d->m_deviceAgent) { + if (d->m_deviceAgent) d->m_deviceAgent->stop(); - } else if (d->m_serviceAgent) { + if (d->m_serviceAgent) d->m_serviceAgent->stop(); - } } else { clearModel(); d->m_error = NoError; |