diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:45:58 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:45:58 +0100 |
| commit | da39c8425b53d2e1907470dafc62f0b9621dcbb3 (patch) | |
| tree | ede8eebec69099fdc200c5e0d4d365b29293dadb /examples | |
| parent | 1421e4c482430f9cf76ed7ec7bd5e6857ef9407f (diff) | |
| parent | 8eafcc2d6960390d6784a1c5bb075d6314041fdf (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/bluetooth/qlowenergyservice.cpp
Change-Id: I4b0f68d35ea898819b7c8078b24d55ae90ee529c
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/bluetooth/scanner/scanner.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/examples/bluetooth/scanner/scanner.qml b/examples/bluetooth/scanner/scanner.qml index 67aaecf0..543e19de 100644 --- a/examples/bluetooth/scanner/scanner.qml +++ b/examples/bluetooth/scanner/scanner.qml @@ -60,6 +60,8 @@ Item { console.log("Error: Bluetooth device not turned on"); break; case BluetoothDiscoveryModel.InputOutputError: console.log("Error: Bluetooth I/O Error"); break; + case BluetoothDiscoveryModel.InvalidBluetoothAdapterError: + console.log("Error: Invalid Bluetooth Adapter Error"); break; case BluetoothDiscoveryModel.NoError: break; default: |