Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I6c1eabeea1b3397803e285d13cef147220ff5aa4

1 files changed, 4 insertions, 3 deletions

diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp
index c8cd17bd..0891f040 100644
--- a/examples/bluetooth/lowenergyscanner/device.cpp
+++ b/examples/bluetooth/lowenergyscanner/device.cpp
@@ -155,7 +155,7 @@ void Device::scanServices(const QString &address)
     m_services.clear();
     emit servicesUpdated();
 
-    setUpdate("Connecting to device...");
+    setUpdate("Back\n(Connecting to device...)");
 
     if (controller && controller->remoteAddress() != currentDevice.getDevice().address()) {
         controller->disconnectFromDevice();
@@ -209,7 +209,7 @@ void Device::addLowEnergyService(const QBluetoothUuid &serviceUuid)
 
 void Device::serviceScanDone()
 {
-    setUpdate("Service scan done!");
+    setUpdate("Back\n(Service scan done!)");
     // force UI in case we didn't find anything
     if (m_services.isEmpty())
         emit servicesUpdated();
@@ -238,6 +238,7 @@ void Device::connectToService(const QString &uuid)
         connect(service, SIGNAL(stateChanged(QLowEnergyService::ServiceState)),
                 this, SLOT(serviceDetailsDiscovered(QLowEnergyService::ServiceState)));
         service->discoverDetails();
+        setUpdate("Back\n(Discovering details...)");
         //! [les-service-3]
         return;
     }
@@ -254,7 +255,7 @@ void Device::connectToService(const QString &uuid)
 
 void Device::deviceConnected()
 {
-    setUpdate("Discovering services!");
+    setUpdate("Back\n(Discovering services...)");
     connected = true;
     //! [les-service-2]
     controller->discoverServices();