From 6c91ad8a7fe8adc555b57570486122f31f88d01b Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 24 Mar 2020 10:09:27 +0100 Subject: QLowEnergyControllerPrivateWinRT::connectToDevice: Return early if LE device cannot be found If the host does not support BTLE, connectToDevice will fail and mDevice will be zero. The return in this case was missing so that we tried to access a null pointer and caused an exception. (cherry picked from commit 280cfd43012d1cfbfcd26fe57f633db3fc13a379) Change-Id: I24ea52b0d62c6e789c794fed8d75087fea7277b8 Reviewed-by: Timur Pocheptsov --- src/bluetooth/qlowenergycontroller_winrt.cpp | 1 + 1 file changed, 1 insertion(+) 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); -- cgit v1.2.3 From a526644f2f2c7359cbe7d50bea09ded3e6c65e4d Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Mon, 16 Mar 2020 13:57:44 +0200 Subject: Add changes file for Qt 5.12.8 + 02a4d36239aca65cd1ab93ec686deac05a0e918a Bump version + 5f6187cb9e17b55cd2a68ac3094ae6a1879b50a2 Add descriptor even if the read fails during service discovery + e851596c284bfa3ef5be1bb982cf8a57360baed9 Grant ACCESS_FINE_LOCATION to QtBluetooth + b4bd5c9852c1414cc45a551590fa485ade764c63 Add location-turned-on check before starting device discovery + 08fa2adc272ae58564601e92dc5d1459d8dc89ba Ensure that a failing classic discovery doesn't prevent LE scan + b4282fd32ea06c1d634ea322f682a4c939a0cc89 Also add a response for a request if reportError is called + 6c91ad8a7fe8adc555b57570486122f31f88d01b QLowEnergyControllerPrivateWinRT::connectToDevice: Return early if LE device cannot be found Change-Id: I7c027b70797a6d13466ad1edac3a80abfda858b8 Reviewed-by: Alex Blasche --- dist/changes-5.12.8 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dist/changes-5.12.8 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. -- cgit v1.2.3