diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:51 +0200 |
| commit | 5b3fd55deca9ec58038e0297b8204053abefc166 (patch) | |
| tree | 0da6e563051d6fb104fe7816f49bee9e49748e87 /src | |
| parent | acaab9e6425726d7a3901e6224c6e59874bc5a62 (diff) | |
| parent | d332ce0f202c3a7065901a7f6d7fdd99438e7670 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I16d831a6ab1e22c03ce82f076f6759eb6531a8cd
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp index a6aaaf03..f977c471 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp @@ -201,6 +201,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::processSdpDiscoveryFinished() // start LE scan if supported if (QtAndroidPrivate::androidSdkVersion() < 18) { qCDebug(QT_BT_ANDROID) << "Skipping Bluetooth Low Energy device scan"; + m_active = NoScanActive; emit q->finished(); } else { startLowEnergyScan(); |