summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-19 03:00:49 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-19 03:00:49 +0200
commit81fece51fede3c83ce80400b1c4c61eb0c08487f (patch)
tree08c39612b7e42aa0a55b45651e10998dd215b2f1
parent6976e48c4b10451808b7cbe753ae879acf018259 (diff)
parent57ab030cdb245750e1043e3c5ca99c4f409cc868 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
-rw-r--r--src/bluetooth/qlowenergycontroller_bluezdbus.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
index afc4b8c1..8f001f92 100644
--- a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
@@ -289,7 +289,10 @@ void QLowEnergyControllerPrivateBluezDBus::connectToDevice()
if (device->connected() && device->servicesResolved()) {
//connectToDevice is noop
disconnectSignalRequired = true;
+
setState(QLowEnergyController::ConnectedState);
+ Q_Q(QLowEnergyController);
+ emit q->connected();
return;
}