summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-08 03:01:30 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-08 03:01:31 +0200
commitfa9aa433f88274e8871e4899d9cd88cbb9190793 (patch)
tree4fb7f1ab5faeecea3c5b655c323395ecd6e40023
parentc77d7bb17e9b0174abc045f73430291710acfc3c (diff)
parent771867113c7d531f576768652a40c5cf53d9e57f (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
-rw-r--r--src/bluetooth/qlowenergycontroller_winrt.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bluetooth/qlowenergycontroller_winrt.cpp b/src/bluetooth/qlowenergycontroller_winrt.cpp
index f6cca42c..4beea12d 100644
--- a/src/bluetooth/qlowenergycontroller_winrt.cpp
+++ b/src/bluetooth/qlowenergycontroller_winrt.cpp
@@ -413,7 +413,11 @@ void QLowEnergyControllerPrivateWinRT::connectToDevice()
setState(QLowEnergyController::UnconnectedState);
return;
} else {
- Q_ASSERT_SUCCEEDED(hr);
+ qCWarning(QT_BT_WINRT) << "Connecting to device failed: "
+ << qt_error_string(hr);
+ setError(QLowEnergyController::ConnectionError);
+ setState(QLowEnergyController::UnconnectedState);
+ return;
}
ComPtr<ABI::Windows::Storage::Streams::IBuffer> buffer;
hr = result->get_Value(&buffer);