diff -Nru qtconnectivity-opensource-src-5.12.8/config.tests/bluez/main.cpp qtconnectivity-opensource-src-5.14.2/config.tests/bluez/main.cpp --- qtconnectivity-opensource-src-5.12.8/config.tests/bluez/main.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/config.tests/bluez/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -35,5 +35,10 @@ bacmp(&anyTmp, &localTmp); + uint32_t field0 = 1; + uint16_t field1 = 1; + + field0 = htonl(field0); + field1 = htons(field1); return 0; } diff -Nru qtconnectivity-opensource-src-5.12.8/config.tests/winrt_btle_no_pairing/main.cpp qtconnectivity-opensource-src-5.14.2/config.tests/winrt_btle_no_pairing/main.cpp --- qtconnectivity-opensource-src-5.12.8/config.tests/winrt_btle_no_pairing/main.cpp 1970-01-01 00:00:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/config.tests/winrt_btle_no_pairing/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtConnectivity module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#if defined(_WIN32) && defined(__INTEL_COMPILER) +#error "Windows ICC fails to build the WinRT backend (QTBUG-68026)." +#endif + +int main() +{ + (void)Microsoft::WRL::ComPtr().Get(); + return 0; +} diff -Nru qtconnectivity-opensource-src-5.12.8/config.tests/winrt_btle_no_pairing/winrt.pro qtconnectivity-opensource-src-5.14.2/config.tests/winrt_btle_no_pairing/winrt.pro --- qtconnectivity-opensource-src-5.12.8/config.tests/winrt_btle_no_pairing/winrt.pro 1970-01-01 00:00:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/config.tests/winrt_btle_no_pairing/winrt.pro 2020-03-03 13:10:31.000000000 +0000 @@ -0,0 +1,3 @@ +SOURCES += main.cpp + +!winrt: LIBS += runtimeobject.lib diff -Nru qtconnectivity-opensource-src-5.12.8/debian/changelog qtconnectivity-opensource-src-5.14.2/debian/changelog --- qtconnectivity-opensource-src-5.12.8/debian/changelog 2020-04-10 09:39:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/debian/changelog 2020-05-06 13:36:29.000000000 +0000 @@ -1,16 +1,18 @@ -qtconnectivity-opensource-src (5.12.8-0ubuntu1) focal; urgency=medium +qtconnectivity-opensource-src (5.14.2-1) experimental; urgency=medium - * New upstream bugfix release. - * Bump Qt build-dependencies to 5.12.8. - * Update debian/libqt5bluetooth5.symbols from the current build log. + * New upstream release. + * Bump Qt build-dependencies to 5.14.2. + * Update debian/libqt5bluetooth5.symbols from buildds’ logs. + - Mark QBluetoothServiceInfo::setAttribute as optional (closes: #957727). + * Update to debhelper compat level 13. + - Build-depend on debhelper-compat virtual package. + - Remove --fail-missing dh option, it is now the default. + * Remove build paths from prl files for reproducibility. + * Update symbols files from the current build log. + * Update debian/copyright. + * Bump Standards-Version to 4.5.0, no changes needed. - -- Dmitry Shachnev Fri, 10 Apr 2020 12:39:00 +0300 - -qtconnectivity-opensource-src (5.12.5-1build1) focal; urgency=medium - - * No-change rebuild for libgcc-s1 package name change. - - -- Matthias Klose Mon, 23 Mar 2020 07:23:43 +0100 + -- Dmitry Shachnev Wed, 06 May 2020 16:36:29 +0300 qtconnectivity-opensource-src (5.12.5-1) unstable; urgency=medium diff -Nru qtconnectivity-opensource-src-5.12.8/debian/compat qtconnectivity-opensource-src-5.14.2/debian/compat --- qtconnectivity-opensource-src-5.12.8/debian/compat 2020-04-10 09:39:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru qtconnectivity-opensource-src-5.12.8/debian/control qtconnectivity-opensource-src-5.14.2/debian/control --- qtconnectivity-opensource-src-5.12.8/debian/control 2020-04-10 09:39:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/debian/control 2020-05-06 13:36:29.000000000 +0000 @@ -1,8 +1,7 @@ Source: qtconnectivity-opensource-src Section: libs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Maintainer: Debian Qt/KDE Maintainers Uploaders: Sune Vuorela , Pino Toscano , Lisandro Damián Nicanor Pérez Meyer , @@ -10,16 +9,16 @@ Timo Jyrinki , Dmitry Shachnev , Simon Quigley -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper-compat (= 13), libbluetooth-dev [linux-any], pkg-config, pkg-kde-tools, - qtbase5-dev (>= 5.12.8+dfsg~), - qtbase5-private-dev (>= 5.12.8+dfsg~), - qtdeclarative5-dev (>= 5.12.8~) -Build-Depends-Indep: qtbase5-doc-html (>= 5.12.8+dfsg~) , - qttools5-dev-tools (>= 5.12.8~) -Standards-Version: 4.4.1 + qtbase5-dev (>= 5.14.2+dfsg~), + qtbase5-private-dev (>= 5.14.2+dfsg~), + qtdeclarative5-dev (>= 5.14.2+dfsg~) +Build-Depends-Indep: qtbase5-doc-html (>= 5.14.2+dfsg~) , + qttools5-dev-tools (>= 5.14.2~) +Standards-Version: 4.5.0 Homepage: https://doc.qt.io/qt-5/topics-network-connectivity.html Vcs-Git: https://salsa.debian.org/qt-kde-team/qt/qtconnectivity.git Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt/qtconnectivity diff -Nru qtconnectivity-opensource-src-5.12.8/debian/copyright qtconnectivity-opensource-src-5.14.2/debian/copyright --- qtconnectivity-opensource-src-5.12.8/debian/copyright 2020-04-10 09:39:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/debian/copyright 2020-05-06 13:36:29.000000000 +0000 @@ -1,9 +1,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: qtconnectivity-opensource-src +Upstream-Name: qtconnectivity-everywhere-src Source: https://download.qt.io/official_releases/qt/*/submodules/ Files: * -Copyright: 2015-2018 The Qt Company Ltd. +Copyright: 2015-2019 The Qt Company Ltd. 2012-2016 BlackBerry Limited (formerly Research In Motion) 2016 Centria research and development 2015-2016 BasysKom GmbH @@ -22,7 +22,7 @@ 2005-2007 Brian Nelson 2012-2013 Timo Jyrinki 2014-2018 Lisandro Damián Nicanor Pérez Meyer - 2015-2018 Dmitry Shachnev + 2015-2020 Dmitry Shachnev 2018 Simon Quigley License: LGPL-3 or GPL-2+ @@ -45,17 +45,29 @@ Files: src/bluetooth/bluez/hcimanager.cpp src/bluetooth/qlowenergycontroller_bluez.cpp - src/bluetooth/qlowenergycontroller_osx* + src/bluetooth/qlowenergycontroller_darwin* src/bluetooth/qlowenergyservice.* - src/bluetooth/qlowenergyservice_osx.mm Copyright: 2016 Javier S. Pedro 2016-2017 The Qt Company Ltd. License: LGPL-3 or GPL-2+ -Files: src/nfc/qnearfieldtarget_neard_p.cpp +Files: src/bluetooth/qbluetooth.cpp + src/bluetooth/qbluetoothdevicediscoveryagent.h + src/bluetooth/qbluetoothdevicediscoveryagent_p.h + src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp + src/bluetooth/qbluetoothlocaldevice_p.h + src/bluetooth/qbluetoothlocaldevice_win.cpp + src/bluetooth/qlowenergycontroller_win.cpp + src/bluetooth/windows/qwinlowenergybluetooth_p.h +Copyright: 2014 Denis Shienkov + 2016-2018 The Qt Company Ltd. +License: LGPL-3 or GPL-2+ + +Files: src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfcBroadcastReceiver.java + src/nfc/qnearfieldtarget_neard_p.cpp src/nfc/qnearfieldtarget_p.cpp src/nfc/qnearfieldtarget_android_p.cpp -Copyright: 2017 Governikus GmbH & Co. K +Copyright: 2017-2018 Governikus GmbH & Co. K License: LGPL-3 or GPL-2+ Files: config.tests/* @@ -65,7 +77,7 @@ License: GPL-3 with Qt-1.0 exception Files: *.qdoc -Copyright: 2017 The Qt Company Ltd. +Copyright: 2017-2019 The Qt Company Ltd. 2013 Aaron McCarthy 2015 BasysKom GmbH License: GFDL-NIV-1.3 diff -Nru qtconnectivity-opensource-src-5.12.8/debian/libqt5bluetooth5.symbols qtconnectivity-opensource-src-5.14.2/debian/libqt5bluetooth5.symbols --- qtconnectivity-opensource-src-5.12.8/debian/libqt5bluetooth5.symbols 2020-04-10 09:39:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/debian/libqt5bluetooth5.symbols 2020-05-06 13:36:29.000000000 +0000 @@ -1,10 +1,12 @@ -# SymbolsHelper-Confirmed: 5.12.8 armhf +# SymbolsHelper-Confirmed: 5.14.2 amd64 libQt5Bluetooth.so.5 libqt5bluetooth5 #MINVER# * Build-Depends-Package: qtconnectivity5-dev Qt_5.0@Qt_5.0 5.6.0 Qt_5.10@Qt_5.10 5.10.1 Qt_5.11@Qt_5.11 5.11.1 Qt_5.12@Qt_5.12 5.12.0 + Qt_5.13@Qt_5.13 5.14.2 + Qt_5.14@Qt_5.14 5.14.2 Qt_5.1@Qt_5.1 5.6.0 Qt_5.2@Qt_5.2 5.6.0 Qt_5.3@Qt_5.3 5.6.0 @@ -135,6 +137,7 @@ _ZN18QBluetoothHostInfoaSERKS_@Qt_5 5.6.0 _ZN20QBluetoothDeviceInfo13setDeviceUuidERK14QBluetoothUuid@Qt_5 5.6.0 _ZN20QBluetoothDeviceInfo15setServiceUuidsERK5QListI14QBluetoothUuidENS_16DataCompletenessE@Qt_5 5.6.0 + _ZN20QBluetoothDeviceInfo15setServiceUuidsERK7QVectorI14QBluetoothUuidE@Qt_5 5.14.2 _ZN20QBluetoothDeviceInfo19setManufacturerDataEtRK10QByteArray@Qt_5 5.12.2 _ZN20QBluetoothDeviceInfo21setCoreConfigurationsE6QFlagsINS_17CoreConfigurationEE@Qt_5 5.6.0 _ZN20QBluetoothDeviceInfo7setRssiEs@Qt_5 5.6.0 @@ -155,6 +158,7 @@ _ZN20QLowEnergyController11qt_metacastEPKc@Qt_5 5.6.0 _ZN20QLowEnergyController12disconnectedEv@Qt_5 5.6.0 _ZN20QLowEnergyController12stateChangedENS_15ControllerStateE@Qt_5 5.6.0 + _ZN20QLowEnergyController13createCentralERK17QBluetoothAddressS2_P7QObject@Qt_5 5.14.2 _ZN20QLowEnergyController13createCentralERK20QBluetoothDeviceInfoP7QObject@Qt_5 5.7.0 _ZN20QLowEnergyController15connectToDeviceEv@Qt_5 5.6.0 _ZN20QLowEnergyController15stopAdvertisingEv@Qt_5 5.7.0 @@ -214,7 +218,7 @@ _ZN21QBluetoothLocalDeviceD1Ev@Qt_5 5.6.0 _ZN21QBluetoothLocalDeviceD2Ev@Qt_5 5.6.0 _ZN21QBluetoothServiceInfo12setAttributeEtRK8QVariant@Qt_5 5.6.0 - _ZN21QBluetoothServiceInfo12setAttributeEtRKNS_8SequenceE@Qt_5 5.6.0 + (optional=inline)_ZN21QBluetoothServiceInfo12setAttributeEtRKNS_8SequenceE@Qt_5 5.6.0 _ZN21QBluetoothServiceInfo15registerServiceERK17QBluetoothAddress@Qt_5 5.6.0 _ZN21QBluetoothServiceInfo15removeAttributeEt@Qt_5 5.6.0 _ZN21QBluetoothServiceInfo17unregisterServiceEv@Qt_5 5.6.0 @@ -311,7 +315,7 @@ (arch=linux-any)_ZN28QBluetoothTransferReplyBluez12sendReturnedEP23QDBusPendingCallWatcher@Qt_5_PRIVATE_API 5.6.0 _ZN28QBluetoothTransferReplyBluez14cleanupSessionEv@Qt_5_PRIVATE_API 5.6.0 (arch=linux-any)_ZN28QBluetoothTransferReplyBluez14copyToTempFileEP9QIODeviceS1_@Qt_5_PRIVATE_API 5.6.0 - _ZN28QBluetoothTransferReplyBluez14sessionChangedERK7QStringRK4QMapIS0_8QVariantERK11QStringList@Qt_5_PRIVATE_API 5.6.0 + _ZN28QBluetoothTransferReplyBluez14sessionChangedERK7QStringRK4QMapIS0_8QVariantERK11QStringListRK12QDBusMessage@Qt_5_PRIVATE_API 5.14.2 _ZN28QBluetoothTransferReplyBluez14sessionCreatedEP23QDBusPendingCallWatcher@Qt_5_PRIVATE_API 5.6.0 _ZN28QBluetoothTransferReplyBluez14sessionStartedEP23QDBusPendingCallWatcher@Qt_5_PRIVATE_API 5.6.0 (arch=linux-any)_ZN28QBluetoothTransferReplyBluez16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0 diff -Nru qtconnectivity-opensource-src-5.12.8/debian/libqt5nfc5.symbols qtconnectivity-opensource-src-5.14.2/debian/libqt5nfc5.symbols --- qtconnectivity-opensource-src-5.12.8/debian/libqt5nfc5.symbols 2020-04-10 09:39:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/debian/libqt5nfc5.symbols 2020-05-06 13:36:29.000000000 +0000 @@ -1,10 +1,12 @@ -# SymbolsHelper-Confirmed: 5.12.2 amd64 +# SymbolsHelper-Confirmed: 5.14.2 amd64 libQt5Nfc.so.5 libqt5nfc5 #MINVER# * Build-Depends-Package: qtconnectivity5-dev Qt_5.0@Qt_5.0 5.6.0 Qt_5.10@Qt_5.10 5.10.1 Qt_5.11@Qt_5.11 5.11.1 Qt_5.12@Qt_5.12 5.12.0 + Qt_5.13@Qt_5.13 5.14.2 + Qt_5.14@Qt_5.14 5.14.2 Qt_5.1@Qt_5.1 5.6.0 Qt_5.2@Qt_5.2 5.6.0 Qt_5.3@Qt_5.3 5.6.0 diff -Nru qtconnectivity-opensource-src-5.12.8/debian/rules qtconnectivity-opensource-src-5.14.2/debian/rules --- qtconnectivity-opensource-src-5.12.8/debian/rules 2020-04-10 09:39:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/debian/rules 2020-05-06 13:36:29.000000000 +0000 @@ -8,7 +8,7 @@ export QT_SELECT := qt5 %: - dh $@ --fail-missing --with pkgkde_symbolshelper + dh $@ --with pkgkde_symbolshelper override_dh_auto_configure: # Be sure to regenerate the DBus cpp files @@ -22,6 +22,13 @@ override_dh_auto_build-indep: dh_auto_build -Smakefile -- docs +override_dh_auto_install-arch: + dh_auto_install + + # Reproducible builds: remove build paths from prl files. + sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5Bluetooth.prl + sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5Nfc.prl + override_dh_auto_install-indep: make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs diff -Nru qtconnectivity-opensource-src-5.12.8/dist/changes-5.12.6 qtconnectivity-opensource-src-5.14.2/dist/changes-5.12.6 --- qtconnectivity-opensource-src-5.12.8/dist/changes-5.12.6 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/dist/changes-5.12.6 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Qt 5.12.6 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.5. - -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 -Nru qtconnectivity-opensource-src-5.12.8/dist/changes-5.12.7 qtconnectivity-opensource-src-5.14.2/dist/changes-5.12.7 --- qtconnectivity-opensource-src-5.12.8/dist/changes-5.12.7 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/dist/changes-5.12.7 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Qt 5.12.7 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.6. - -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 -Nru qtconnectivity-opensource-src-5.12.8/dist/changes-5.12.8 qtconnectivity-opensource-src-5.14.2/dist/changes-5.12.8 --- qtconnectivity-opensource-src-5.12.8/dist/changes-5.12.8 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/dist/changes-5.12.8 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -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 -Nru qtconnectivity-opensource-src-5.12.8/dist/changes-5.13.0 qtconnectivity-opensource-src-5.14.2/dist/changes-5.13.0 --- qtconnectivity-opensource-src-5.12.8/dist/changes-5.13.0 1970-01-01 00:00:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/dist/changes-5.13.0 2020-03-03 13:10:31.000000000 +0000 @@ -0,0 +1,59 @@ +Qt 5.13 introduces many new features and improvements as well as bugfixes +over the 5.12.x series. 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.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +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. + +**************************************************************************** +* Qt 5.13.0 Changes * +**************************************************************************** + +QtBluetooth +----------- + + - [QTBUG-58660] Added ability to connect to BLE devices on WinRT without + pairing. + + - [QTBUG-69954] Fixed potential crash due to late callbacks on WinRT. + + - Improved WinRT implementation signficantly. This incorporates a large + number of patches (each improving the stability and general robustness of + the code base). During the process the number of potential asserts was + reduced as well. + + - Deprecated QBluetoothDeviceInfo::DataCompleteness related APIs. + + - Replaced QBluetoothDeviceInfo::LanAccessDevice with QBluetoothDeviceInfo::NetworkDevice. + LanAccessDevice was deprecated. + + - Implemented support for QBluetoothDeviceDiscoveryAgent::deviceUpdated() on Apple and WinRT + platforms. + + - [QTBUG-71943] Implemented RSSI and manufacturer data discovery on WinRT. + + - [QTBUG-74394] Fixed broken QLowEnergyController::disconnectFromDevice() on WinRT. + + - Added a compile fix for g++ 8. + + - [QTBUG-73717] Fixed warnings in QDeclarativeBluetoothDiscoveryModel. + +QtNfc +----- + + - QNearFieldManager: + * adapterStateChanged() now has a fully qualified parameter + QNearFieldManager::AdapterState. This can cause a problem if the + connection/method invocation was done with just AdapterState as the + parameter type, in which case these need to be changed to use + QNearFieldManager::AdapaterState instead. diff -Nru qtconnectivity-opensource-src-5.12.8/dist/changes-5.13.1 qtconnectivity-opensource-src-5.14.2/dist/changes-5.13.1 --- qtconnectivity-opensource-src-5.12.8/dist/changes-5.13.1 1970-01-01 00:00:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/dist/changes-5.13.1 2020-03-03 13:10:31.000000000 +0000 @@ -0,0 +1,36 @@ +Qt 5.13.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0. + +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.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +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. + +**************************************************************************** +* Qt 5.13.1 Changes * +**************************************************************************** + +QtBluetooth +----------- + + - [QTBUG-62520] Improved stability of QBluetoothSocket::connectToService() + on WinRT. + + - [QTBUG-62294] Added implementation for QBluetoothLocalSocket on WinRT. Note + that the platform only supports pairingStatus() related features. + + - Improved stability of QLowEnergyController on WinRT. + + - [QTBUG-75907] Reduced number of asserts in QLowEnergyController on WinRT. + diff -Nru qtconnectivity-opensource-src-5.12.8/dist/changes-5.13.2 qtconnectivity-opensource-src-5.14.2/dist/changes-5.13.2 --- qtconnectivity-opensource-src-5.12.8/dist/changes-5.13.2 1970-01-01 00:00:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/dist/changes-5.13.2 2020-03-03 13:10:31.000000000 +0000 @@ -0,0 +1,35 @@ +Qt 5.13.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0 through 5.13.1. + +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.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +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. + +**************************************************************************** +* Qt 5.13.2 Changes * +**************************************************************************** + +QtBluetooth +----------- + + - [QTQAINFRA-2139] Fixed QMutex related compile error when using clang on + Windows. + + - [QTBUG-78201] Fixed a case where an existing descriptor was not discovered + during the service discovery due to not being readable. This issue happened + on Android. + + - Fixed a few minor documentation issues. + diff -Nru qtconnectivity-opensource-src-5.12.8/dist/changes-5.14.0 qtconnectivity-opensource-src-5.14.2/dist/changes-5.14.0 --- qtconnectivity-opensource-src-5.12.8/dist/changes-5.14.0 1970-01-01 00:00:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/dist/changes-5.14.0 2020-03-03 13:10:31.000000000 +0000 @@ -0,0 +1,53 @@ +Qt 5.14 introduces many new features and improvements as well as bugfixes +over the 5.13.x series. 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.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +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. + +**************************************************************************** +* Android * +**************************************************************************** + + - [QTBUG-67482] Ported Bluetooth device scanning API to BluetoothLeScanner + API. This API will be used on Android SDK v21+. + + - [QTBUG-69615] Fixed classic device discovery problems on Android. Newer + Android versions (9+) require Location permission for classic device + discovery. + +**************************************************************************** +* QtBluetooth * +**************************************************************************** + + - Added possibility to build win32 backend which also works on Windows 7. + + - Deprecated QBluetoothServiceInfo::DataComplete. + + - Signficant refactoring of the Apple platform Bluetooth code to bring it + closer to all other code lines. Previously the macOS and iOS code was very + distinct which caused duplicated code lines. + + - Proved the examples for HighDPI use cases. + + - Added QLowEnergyController::Authorization enum value. + + - [QTBUG-76615] Added the ability to support multiple manufacturer data + entries per QBluetoothDeviceInfo instance. This is of relevance when dealing + with BluetoothDeviceDiscoveryAgent::deviceUpdated() signals. + + - [QTBUG77390] Reduced likelyhood of blocking the main event loop on Linux when + doing a device scan. + + - [BlueZ] [QTBUG-63019] Added QLowEnergyController::createCentral with + locale device overload. diff -Nru qtconnectivity-opensource-src-5.12.8/dist/changes-5.14.1 qtconnectivity-opensource-src-5.14.2/dist/changes-5.14.1 --- qtconnectivity-opensource-src-5.12.8/dist/changes-5.14.1 1970-01-01 00:00:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/dist/changes-5.14.1 2020-03-03 13:10:31.000000000 +0000 @@ -0,0 +1,25 @@ +Qt 5.14.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0. + +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.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +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. + +**************************************************************************** +* QtBluetooth * +**************************************************************************** + + - BlueZ-DBus: + * Invalidate btle service when it has disappeared diff -Nru qtconnectivity-opensource-src-5.12.8/dist/changes-5.14.2 qtconnectivity-opensource-src-5.14.2/dist/changes-5.14.2 --- qtconnectivity-opensource-src-5.12.8/dist/changes-5.14.2 1970-01-01 00:00:00.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/dist/changes-5.14.2 2020-03-03 13:10:31.000000000 +0000 @@ -0,0 +1,49 @@ +Qt 5.14.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0 through 5.14.1. + +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.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +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. + +**************************************************************************** +* QtBluetooth * +**************************************************************************** + + - Windows: + * [QTBUG-80770] Fixed service state (DiscoveryRequired) when service + detail discovery fails. + * [QTBUG-81827] Avoid possible lock when calling + QBluetoothServer::hasPendingConnections. + - Android: + * Fixed the missing QLowEnergyService::error() signal emission if the + error was detected on the Java side. This probably cut 50% of all + errors out. + * Fixed runtime exception that happened when calling "stopLeScan" when + device's Bluetooth adapter is turned off. + * [QTBUG-81875] Fixed QBluetoothDeviceDiscoveryAgent with Android API 29. + * Fixed race condition where incoming and outgoing Low Energy requests + could overwrite each others payload. + - Linux: + * [QTBUG-81696] Added support for characteristic Write Without Response + requests when using BlueZ 5.50 or later. + +**************************************************************************** +* QtNFC * +**************************************************************************** + + - Android: + * Fixed case when QNearFieldTarget::waitForRequestCompleted() did not stop + early (caused overly long timeout case) despite QNearFieldTarget::sendCommand() + having failed already. diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btchat/main.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btchat/main.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btchat/main.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btchat/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -56,6 +56,7 @@ int main(int argc, char *argv[]) { //QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); Chat d; diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btchat/remoteselector.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btchat/remoteselector.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btchat/remoteselector.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btchat/remoteselector.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -114,17 +114,15 @@ << serviceInfo.protocolServiceMultiplexer(); qDebug() << "\tRFCOMM server channel:" << serviceInfo.serverChannel(); #endif - QMapIterator i(m_discoveredServices); - while (i.hasNext()){ - i.next(); - if (serviceInfo.device().address() == i.value().device().address()){ + const QBluetoothAddress address = serviceInfo.device().address(); + for (const QBluetoothServiceInfo &info : qAsConst(m_discoveredServices)) { + if (info.device().address() == address) return; - } } QString remoteName; if (serviceInfo.device().name().isEmpty()) - remoteName = serviceInfo.device().address().toString(); + remoteName = address.toString(); else remoteName = serviceInfo.device().name(); diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/main.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/main.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/main.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -54,6 +54,7 @@ int main(int argc, char *argv[]) { + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); RemoteSelector d; diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/pindisplay.h qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/pindisplay.h --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/pindisplay.h 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/pindisplay.h 2020-03-03 13:10:31.000000000 +0000 @@ -64,7 +64,7 @@ Q_OBJECT public: - explicit pinDisplay(QString title, QString pin, QWidget *parent = 0); + explicit pinDisplay(QString title, QString pin, QWidget *parent = nullptr); ~pinDisplay(); void setOkCancel(); diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/progress.h qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/progress.h --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/progress.h 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/progress.h 2020-03-03 13:10:31.000000000 +0000 @@ -52,7 +52,7 @@ #define PROGRESS_H #include -#include +#include QT_FORWARD_DECLARE_CLASS(QBluetoothTransferReply) @@ -69,7 +69,7 @@ Q_OBJECT public: - explicit Progress(QWidget *parent = 0); + explicit Progress(QWidget *parent = nullptr); ~Progress(); void setStatus(QString title, QString filename); @@ -81,7 +81,7 @@ private: Ui::Progress *ui; - QTime start; + QElapsedTimer start; }; #endif // PROGRESS_H diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/remoteselector.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/remoteselector.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/remoteselector.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/remoteselector.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -171,18 +171,17 @@ // new QListWidgetItem(QString::fromLatin1("%1\t%2\t%3").arg(serviceInfo.device().address().toString(), // serviceInfo.device().name(), serviceInfo.serviceName())); - QMutableMapIterator i(m_discoveredServices); - while (i.hasNext()){ - i.next(); - if (serviceInfo.device().address() == i.value().device().address()){ - i.setValue(serviceInfo); + const QBluetoothAddress address = serviceInfo.device().address(); + for (QBluetoothServiceInfo &info : m_discoveredServices) { + if (info.device().address() == address){ + info = serviceInfo; return; } } int row = ui->remoteDevices->rowCount(); ui->remoteDevices->insertRow(row); - QTableWidgetItem *item = new QTableWidgetItem(serviceInfo.device().address().toString()); + QTableWidgetItem *item = new QTableWidgetItem(address.toString()); ui->remoteDevices->setItem(row, 0, item); item = new QTableWidgetItem(serviceInfo.device().name()); ui->remoteDevices->setItem(row, 1, item); @@ -190,9 +189,7 @@ ui->remoteDevices->setItem(row, 2, item); - QBluetoothLocalDevice::Pairing p; - - p = m_localDevice->pairingStatus(serviceInfo.device().address()); + QBluetoothLocalDevice::Pairing p = m_localDevice->pairingStatus(address); ui->remoteDevices->blockSignals(true); @@ -275,13 +272,11 @@ m_discoveryAgent->stop(); } -QString RemoteSelector::addressToName(const QBluetoothAddress &address) +QString RemoteSelector::addressToName(const QBluetoothAddress &address) const { - QMapIterator i(m_discoveredServices); - while (i.hasNext()){ - i.next(); - if (i.value().device().address() == address) - return i.value().device().name(); + for (const QBluetoothServiceInfo &info : m_discoveredServices) { + if (info.device().address() == address) + return info.device().name(); } return address.toString(); } diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/remoteselector.h qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/remoteselector.h --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btfiletransfer/remoteselector.h 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btfiletransfer/remoteselector.h 2020-03-03 13:10:31.000000000 +0000 @@ -78,7 +78,7 @@ Q_OBJECT public: - explicit RemoteSelector(QWidget *parent = 0); + explicit RemoteSelector(QWidget *parent = nullptr); ~RemoteSelector(); void startDiscovery(const QBluetoothUuid &uuid); @@ -95,7 +95,7 @@ QPointer m_pindisplay; bool m_pairingError; - QString addressToName(const QBluetoothAddress &address); + QString addressToName(const QBluetoothAddress &address) const; public Q_SLOTS: void startDiscovery(); diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btscanner/device.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btscanner/device.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btscanner/device.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btscanner/device.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -109,9 +109,9 @@ QListWidgetItem *item = new QListWidgetItem(label); QBluetoothLocalDevice::Pairing pairingStatus = localDevice->pairingStatus(info.address()); if (pairingStatus == QBluetoothLocalDevice::Paired || pairingStatus == QBluetoothLocalDevice::AuthorizedPaired ) - item->setTextColor(QColor(Qt::green)); + item->setForeground(QColor(Qt::green)); else - item->setTextColor(QColor(Qt::black)); + item->setForeground(QColor(Qt::black)); ui->list->addItem(item); } @@ -218,12 +218,12 @@ if (pairing == QBluetoothLocalDevice::Paired || pairing == QBluetoothLocalDevice::AuthorizedPaired ) { for (int var = 0; var < items.count(); ++var) { QListWidgetItem *item = items.at(var); - item->setTextColor(QColor(Qt::green)); + item->setForeground(QColor(Qt::green)); } } else { for (int var = 0; var < items.count(); ++var) { QListWidgetItem *item = items.at(var); - item->setTextColor(QColor(Qt::red)); + item->setForeground(QColor(Qt::red)); } } } diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btscanner/device.h qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btscanner/device.h --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btscanner/device.h 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btscanner/device.h 2020-03-03 13:10:31.000000000 +0000 @@ -67,7 +67,7 @@ Q_OBJECT public: - DeviceDiscoveryDialog(QWidget *parent = 0); + DeviceDiscoveryDialog(QWidget *parent = nullptr); ~DeviceDiscoveryDialog(); public slots: diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btscanner/main.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btscanner/main.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btscanner/main.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btscanner/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -54,6 +54,7 @@ int main(int argc, char *argv[]) { + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); DeviceDiscoveryDialog d; diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btscanner/service.h qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btscanner/service.h --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/btscanner/service.h 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/btscanner/service.h 2020-03-03 13:10:31.000000000 +0000 @@ -66,7 +66,7 @@ Q_OBJECT public: - ServiceDiscoveryDialog(const QString &name, const QBluetoothAddress &address, QWidget *parent = 0); + ServiceDiscoveryDialog(const QString &name, const QBluetoothAddress &address, QWidget *parent = nullptr); ~ServiceDiscoveryDialog(); public slots: diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/chat/qmlchat.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/chat/qmlchat.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/chat/qmlchat.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/chat/qmlchat.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -62,6 +62,7 @@ int main(int argc, char *argv[]) { //QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication application(argc, argv); QList infos = QBluetoothLocalDevice::allDevices(); diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/heartrate-game/main.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/heartrate-game/main.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/heartrate-game/main.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/heartrate-game/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -60,6 +60,7 @@ int main(int argc, char *argv[]) { QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); ConnectionHandler connectionHandler; diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/heartrate-server/heartrate-server.pro qtconnectivity-opensource-src-5.14.2/examples/bluetooth/heartrate-server/heartrate-server.pro --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/heartrate-server/heartrate-server.pro 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/heartrate-server/heartrate-server.pro 2020-03-03 13:10:31.000000000 +0000 @@ -2,6 +2,7 @@ TARGET = heartrate-server QT = core bluetooth +android: QT += gui CONFIG += c++11 SOURCES += main.cpp diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/heartrate-server/main.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/heartrate-server/main.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/heartrate-server/main.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/heartrate-server/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -57,7 +57,11 @@ #include #include #include +#ifndef Q_OS_ANDROID #include +#else +#include +#endif #include #include #include @@ -66,7 +70,11 @@ int main(int argc, char *argv[]) { //QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); +#ifndef Q_OS_ANDROID QCoreApplication app(argc, argv); +#else + QGuiApplication app(argc, argv); +#endif //! [Advertising Data] QLowEnergyAdvertisingData advertisingData; diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/lowenergyscanner/device.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/lowenergyscanner/device.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/lowenergyscanner/device.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/lowenergyscanner/device.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -108,16 +108,18 @@ //! [les-devicediscovery-3] void Device::addDevice(const QBluetoothDeviceInfo &info) { - if (info.coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration) { - auto d = new DeviceInfo(info); - devices.append(d); - setUpdate("Last device added: " + d->getName()); - } + if (info.coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration) + setUpdate("Last device added: " + info.name()); } //! [les-devicediscovery-3] void Device::deviceScanFinished() { + const QList foundDevices = discoveryAgent->discoveredDevices(); + for (auto nextDevice : foundDevices) + if (nextDevice.coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration) + devices.append(new DeviceInfo(nextDevice)); + emit devicesUpdated(); m_deviceScanState = false; emit stateChanged(); @@ -152,12 +154,12 @@ // We need the current device for service discovery. for (auto d: qAsConst(devices)) { - auto device = qobject_cast(d); - if (!device) - continue; - - if (device->getAddress() == address ) - currentDevice.setDevice(device->getDevice()); + if (auto device = qobject_cast(d)) { + if (device->getAddress() == address ) { + currentDevice.setDevice(device->getDevice()); + break; + } + } } if (!currentDevice.getDevice().isValid()) { diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/lowenergyscanner/main.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/lowenergyscanner/main.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/lowenergyscanner/main.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/lowenergyscanner/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -59,6 +59,7 @@ int main(int argc, char *argv[]) { //QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); Device d; diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/picturetransfer/filetransfer.h qtconnectivity-opensource-src-5.14.2/examples/bluetooth/picturetransfer/filetransfer.h --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/picturetransfer/filetransfer.h 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/picturetransfer/filetransfer.h 2020-03-03 13:10:31.000000000 +0000 @@ -59,7 +59,7 @@ Q_OBJECT Q_PROPERTY(float progress READ getProgress NOTIFY progressChanged) public: - explicit FileTransfer(QObject *parent = 0); + explicit FileTransfer(QObject *parent = nullptr); float getProgress() { return m_progress;} signals: diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/picturetransfer/main.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/picturetransfer/main.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/picturetransfer/main.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/picturetransfer/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) { + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication application(argc, argv); //! [Transfer-2] QQuickView view; diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/pingpong/main.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/pingpong/main.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/pingpong/main.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/pingpong/main.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) { //QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); PingPong pingPong; QQmlApplicationEngine engine; diff -Nru qtconnectivity-opensource-src-5.12.8/examples/bluetooth/scanner/qmlscanner.cpp qtconnectivity-opensource-src-5.14.2/examples/bluetooth/scanner/qmlscanner.cpp --- qtconnectivity-opensource-src-5.12.8/examples/bluetooth/scanner/qmlscanner.cpp 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/bluetooth/scanner/qmlscanner.cpp 2020-03-03 13:10:31.000000000 +0000 @@ -56,6 +56,7 @@ int main(int argc, char *argv[]) { //QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication application(argc, argv); const QString mainQmlApp(QStringLiteral("qrc:/scanner.qml")); QQuickView view; diff -Nru qtconnectivity-opensource-src-5.12.8/examples/nfc/corkboard/android/AndroidManifest.xml qtconnectivity-opensource-src-5.14.2/examples/nfc/corkboard/android/AndroidManifest.xml --- qtconnectivity-opensource-src-5.12.8/examples/nfc/corkboard/android/AndroidManifest.xml 2020-03-16 11:57:44.000000000 +0000 +++ qtconnectivity-opensource-src-5.14.2/examples/nfc/corkboard/android/AndroidManifest.xml 2020-03-03 13:10:31.000000000 +0000 @@ -1,5 +1,5 @@ - + - - - + @@ -72,7 +70,7 @@ - +