diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 12:23:19 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 12:23:19 +0200 |
commit | 896b458247afa1d8a7d326e0f532e8b690920b0a (patch) | |
tree | 06e805e14ba127820262ab8fa9c66b00b117dd97 | |
parent | b4282fd32ea06c1d634ea322f682a4c939a0cc89 (diff) | |
parent | a526644f2f2c7359cbe7d50bea09ded3e6c65e4d (diff) | |
download | qtconnectivity-896b458247afa1d8a7d326e0f532e8b690920b0a.tar.gz |
Merge remote-tracking branch 'origin/5.12.8' into 5.12
Change-Id: I117ad77bf754b72884a1db935472352012a3b4fd
-rw-r--r-- | dist/changes-5.12.8 | 20 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycontroller_winrt.cpp | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/dist/changes-5.12.8 b/dist/changes-5.12.8 new file mode 100644 index 00000000..729d7404 --- /dev/null +++ b/dist/changes-5.12.8 @@ -0,0 +1,20 @@ +Qt 5.12.8 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.7. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/src/bluetooth/qlowenergycontroller_winrt.cpp b/src/bluetooth/qlowenergycontroller_winrt.cpp index f946b541..12ca9d10 100644 --- a/src/bluetooth/qlowenergycontroller_winrt.cpp +++ b/src/bluetooth/qlowenergycontroller_winrt.cpp @@ -325,6 +325,7 @@ void QLowEnergyControllerPrivateWinRT::connectToDevice() qCDebug(QT_BT_WINRT) << "Could not find LE device"; setError(QLowEnergyController::InvalidBluetoothAdapterError); setState(QLowEnergyController::UnconnectedState); + return; } BluetoothConnectionStatus status; hr = mDevice->get_ConnectionStatus(&status); |