diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:51 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:51 +0200 |
commit | 5b3fd55deca9ec58038e0297b8204053abefc166 (patch) | |
tree | 0da6e563051d6fb104fe7816f49bee9e49748e87 | |
parent | acaab9e6425726d7a3901e6224c6e59874bc5a62 (diff) | |
parent | d332ce0f202c3a7065901a7f6d7fdd99438e7670 (diff) |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I16d831a6ab1e22c03ce82f076f6759eb6531a8cd
-rw-r--r-- | dist/changes-5.5.0 | 105 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp | 1 |
2 files changed, 106 insertions, 0 deletions
diff --git a/dist/changes-5.5.0 b/dist/changes-5.5.0 new file mode 100644 index 00000000..9ddd8e36 --- /dev/null +++ b/dist/changes-5.5.0 @@ -0,0 +1,105 @@ +Qt 5.5 introduces many new features and improvements as well as bugfixes +over the 5.4.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.5 series is binary compatible with the 5.4.x series. +Applications compiled for 5.4 will continue to run with 5.5. + +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. + +**************************************************************************** +* Library * +**************************************************************************** + +QtBluetooth +----------- + + - Ported Classic Bluetooth components and classes to OS X. A similar port + to iOS is not possible due to missing platform support. + - Ported Low Energy components to iOS, OS X and Android + - Improved QBluetoothTransferManager documentation + - Improved QLowEnergyService documentation + - Added missing detailsChanged() signal emissions in BluetoothService QML type + + - QBluetoothDeviceDiscoveryAgent: + * Extended QBluetoothDeviceDiscoveryAgent documentation around Bluetooth + Low Energy device discovery + * Added QBluetoothDeviceDiscoveryAgent::UnsupportedPlatformError flag + + - QBluetoothDeviceInfo: + * Added QBluetoothDeviceInfo(QBluetoothUuid,QString,quint32) ctor + * Fixed incorrect initialization of QBluetoothDeviceInfo::coreConfiguration() + in the class ctor. By default, it is set to + QBluetoothDeviceInfo::UnknownCoreConfiguration. + * Added Q_DECLARE_OPERATORS_FOR_FLAGS macro for CoreConfiguration + and ServiceClasses enums + + - QBluetoothHostInfo: + * Added Q_DECLARE_METATYPE + * Added comparison operators + + - QLowEnergyController: + * QLowEnergyController::ConnectionError enum value added. + * Added QLowEnergyController(QBluetoothDeviceInfo) ctor. This ctor is the + preferred ctor. + + - QLowEnergyService: + * Add capability to initiate reading of characteristics and descriptors. Previously + the variable was only updated during the initial service discovery or when + a value notification was received. + * Added guard to prevent writing of service before service discovery + was complete. + * Force write of characteristics and descriptors even when they are marked as + read-only. This permits workarounds where the device's meta data reports + wrong values. + * Improved class documentation + * Added remoteName() member function + + - QBluetoothUuid: + * Extended QBluetoothUuid::ServiceClassUuid enum to incorporate latest + BLuetooth Low Energy service type standards/definitions + * Extended QBluetoothUuid::CharacteristicType to incorporate latest + Bluetooth Low Energy characteritistic standards/definitions + * Extended QBluetoothUuid::DescriptorType to incorporate latest + Bluetooth Low Energy descriptor standards/definitions + + - Examples: + * Fixed several lowenergyscanner example bugs + +QtNfc +----- + + - Ported module to Linux using Neard v0.14+ + - Improved QNdefNfcSmartPosterRecord documentation + - Extended QML NearField type with polling property, tagFound() and tagRemoved signals + - Added QNdefNfcSmartPosterRecord::operator=() operator + + - Examples: + * Fixed several bugs in corkboard example + * Fixed hanging ndefeditor example when receiving invalid NFC requests + * Fixed loading of images in poster example + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Android +------- + + - Added support for Bluetooth Low Energy in Qt Bluetooth + - Avoided duplicated notifications for same device during Bluetooth device + discovery + +Linux/Bluez +----------- + +- Improved Bluez version detection. The previous check didn't handle these + "no Bluez available" case. diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp index a6aaaf03..f977c471 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp @@ -201,6 +201,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::processSdpDiscoveryFinished() // start LE scan if supported if (QtAndroidPrivate::androidSdkVersion() < 18) { qCDebug(QT_BT_ANDROID) << "Skipping Bluetooth Low Energy device scan"; + m_active = NoScanActive; emit q->finished(); } else { startLowEnergyScan(); |