diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-30 10:21:34 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-30 10:21:34 +0200 |
commit | bd7a3e23f6b97249ec99df45b5fed46f3e11c297 (patch) | |
tree | 0b408afbcf2c2ee9f08fed22eee954e0ae471a3b /examples | |
parent | 96ce6cee40889e45691ca50f31a26b5943ee2470 (diff) | |
parent | 0c2b6dc44351352e8a88248b98e1d45c0403e01c (diff) | |
download | qtconnectivity-bd7a3e23f6b97249ec99df45b5fed46f3e11c297.tar.gz |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I20db491b185972148ad3fbe6953e5d6ce2889a7f
Diffstat (limited to 'examples')
-rw-r--r-- | examples/bluetooth/lowenergyscanner/device.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp index afdf13af..82179db1 100644 --- a/examples/bluetooth/lowenergyscanner/device.cpp +++ b/examples/bluetooth/lowenergyscanner/device.cpp @@ -58,6 +58,7 @@ #include <qbluetoothservicediscoveryagent.h> #include <QDebug> #include <QList> +#include <QMetaEnum> #include <QTimer> Device::Device() @@ -347,8 +348,11 @@ void Device::deviceScanError(QBluetoothDeviceDiscoveryAgent::Error error) setUpdate("The Bluetooth adaptor is powered off, power it on before doing discovery."); else if (error == QBluetoothDeviceDiscoveryAgent::InputOutputError) setUpdate("Writing or reading from the device resulted in an error."); - else - setUpdate("An unknown error has occurred."); + else { + static QMetaEnum qme = discoveryAgent->metaObject()->enumerator( + discoveryAgent->metaObject()->indexOfEnumerator("Error")); + setUpdate("Error: " + QLatin1String(qme.valueToKey(error))); + } m_deviceScanState = false; emit devicesUpdated(); |