Merge remote-tracking branch 'origin/5.11' into 5.12

Change-Id: I20db491b185972148ad3fbe6953e5d6ce2889a7f

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();