diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-11-20 15:28:40 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-21 12:46:08 +0100 |
| commit | 839b05ba89134ccc4c4cc7716d18995a4c31b534 (patch) | |
| tree | 90e3c7383c9097dd6e18065c68d687f02630dacd /src/bluetooth/qbluetoothservicediscoveryagent.cpp | |
| parent | 25c2d4793bd4a55eec6e51ccbdfece9e505b8715 (diff) | |
Add missing InvalidBluetoothAdapterError to QML discovery model
QBluetoothServiceDiscoveryAgent::InvalidBluetoothAdapter was introduced
by Qt 5.3 but never added to the QML BluetoothDiscoveryModel. This patch
fixes the problem.
This was noticed due to a crash on Android emulator.
Change-Id: I652576929659ca370216133154e36158e8425711
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index c800dc6d..ef28ef82 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -91,7 +91,8 @@ QT_BEGIN_NAMESPACE \value PoweredOffError The Bluetooth adaptor is powered off, power it on before doing discovery. \value InputOutputError Writing or reading from the device resulted in an error. \value InvalidBluetoothAdapterError The passed local adapter address does not match the physical - adapter address of any local Bluetooth device. + adapter address of any local Bluetooth device. This value + was introduced by Qt 5.3. \value UnknownError An unknown error has occurred. */ |