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

Change-Id: I20db491b185972148ad3fbe6953e5d6ce2889a7f
This commit is contained in:
Qt Forward Merge Bot 2018-08-30 10:21:34 +02:00
commit bd7a3e23f6
1 changed files with 6 additions and 2 deletions

View File

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