From 5ce6d8cf9c32d15bb236ecc8818e761985782e7f Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 19 May 2016 10:52:05 +0200 Subject: Don't print the same advertising code snippet twice Change-Id: I6f2c1fa503f623ca08c8a3f976699d0d7b547c2f Reviewed-by: Christian Kandeler --- src/bluetooth/doc/src/bluetooth-le-overview.qdoc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc index a6b8defa..dc884a79 100644 --- a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc +++ b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc @@ -175,7 +175,6 @@ Low Energy devices. \snippet heartrate-server/main.cpp Advertising Data \snippet heartrate-server/main.cpp Start Advertising - \snippet heartrate-server/main.cpp Advertising Data Now potential clients can connect to our device, discover the provided service and register themselves to get notified of changes to the characteristic value. -- cgit v1.2.3 From b274a37aac474b1603f907f643b178941998523c Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 19 May 2016 12:45:35 +0200 Subject: Mark QBluetooth::AttAccessConstraint as 5.7 API in class docs Change-Id: I50cc1dafeb85d78427f5911e1c607ae0e99ed333 Reviewed-by: Christian Kandeler --- src/bluetooth/qbluetooth.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bluetooth/qbluetooth.cpp b/src/bluetooth/qbluetooth.cpp index 5e8b812a..483fe65a 100644 --- a/src/bluetooth/qbluetooth.cpp +++ b/src/bluetooth/qbluetooth.cpp @@ -76,6 +76,7 @@ namespace QBluetooth { /*! \enum QBluetooth::AttAccessConstraint + \since 5.7 This enum describes the possible requirements for reading or writing an ATT attribute. -- cgit v1.2.3 From 424308422fe0b11e636a0fa6f1d7b91b266d3d1e Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 19 May 2016 13:26:09 +0200 Subject: Add missing \since 5.7 markers to QLE classes Change-Id: I60f7c4751cb2b1a298a22d2b6d44c1c07967e47c Reviewed-by: Christian Kandeler --- src/bluetooth/qlowenergycontroller.cpp | 23 ++++++++++++++++++++++- src/bluetooth/qlowenergyservice.cpp | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp index 7f3995ed..c152ded2 100644 --- a/src/bluetooth/qlowenergycontroller.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -154,6 +154,7 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT) remote device. \value ClosingState The controller is about to be disconnected from the remote device. \value AdvertisingState The controller is currently advertising data. + This value was introduced by Qt 5.7. */ /*! @@ -255,6 +256,7 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT) the other side of the connection requested new parameters. The new values can be retrieved from \a newParameters. + \since 5.7 \sa requestConnectionUpdate() */ @@ -550,9 +552,11 @@ QLowEnergyController::QLowEnergyController( Returns a new object of this class that is in the \l CentralRole and has the parent object \a parent. The \a remoteDevice refers to the device that a connection will be established to later. - * + The controller uses the local default Bluetooth adapter for the connection management. + \sa QLowEnergyController::CentralRole + \since 5.7 */ QLowEnergyController *QLowEnergyController::createCentral(const QBluetoothDeviceInfo &remoteDevice, QObject *parent) @@ -567,7 +571,9 @@ QLowEnergyController *QLowEnergyController::createCentral(const QBluetoothDevice Typically, the next step is to call \l startAdvertising() on the returned object. The controller uses the local default Bluetooth adapter for the connection management. + \sa QLowEnergyController::PeripheralRole + \since 5.7 */ QLowEnergyController *QLowEnergyController::createPeripheral(QObject *parent) { @@ -811,6 +817,9 @@ QLowEnergyService *QLowEnergyController::createServiceObject( If this object is currently not in the \l UnconnectedState, nothing happens. \note Advertising will stop automatically once a client connects to the local device. + + \since 5.7 + \sa stopAdvertising() */ void QLowEnergyController::startAdvertising(const QLowEnergyAdvertisingParameters ¶meters, const QLowEnergyAdvertisingData &advertisingData, @@ -830,6 +839,9 @@ void QLowEnergyController::startAdvertising(const QLowEnergyAdvertisingParameter /*! Stops advertising, if this object is currently in the advertising state. + + \since 5.7 + \sa startAdvertising() */ void QLowEnergyController::stopAdvertising() { @@ -845,6 +857,8 @@ void QLowEnergyController::stopAdvertising() Constructs and returns a \l QLowEnergyService object with \a parent from \a service. The controller must be in the \l PeripheralRole and in the \l UnconnectedState. The \a service object must be valid. + + \since 5.7 \sa QLowEnergyServiceData::addIncludedService */ QLowEnergyService *QLowEnergyController::addService(const QLowEnergyServiceData &service, @@ -916,6 +930,8 @@ QLowEnergyService *QLowEnergyController::addService(const QLowEnergyServiceData with the actual new parameters. See the \l QLowEnergyConnectionParameters class for more information on connection parameters. \note Currently, this functionality is only implemented on Linux. + + \since 5.7 */ void QLowEnergyController::requestConnectionUpdate(const QLowEnergyConnectionParameters ¶meters) { @@ -945,6 +961,11 @@ QString QLowEnergyController::errorString() const /*! Returns the role that this controller object is in. + + The role is determined when constructing a QLowEnergyController instance + using \l createCentral() or \l createPeripheral(). + + \since 5.7 */ QLowEnergyController::Role QLowEnergyController::role() const { diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index 1e5c363d..e9722f81 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -229,6 +229,7 @@ QT_BEGIN_NAMESPACE \value LocalService The service is associated with a controller object in the \l{QLowEnergyController::PeripheralRole}{peripheral role}. Such service objects do not change their state. + This value was introduced by Qt 5.7. */ /*! -- cgit v1.2.3 From 4a75171aedee5a07295527fc7b25f7b7a2c5cb51 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 19 May 2016 11:34:19 +0200 Subject: Improve QtBluetooth index page This emphasizes the status of new API additions. Change-Id: Ida21c100f7636d7878dece13145d4595c76eaa9c Reviewed-by: Christian Kandeler --- src/bluetooth/doc/src/bluetooth-index.qdoc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc index 8ea4c7f9..bf93ac43 100644 --- a/src/bluetooth/doc/src/bluetooth-index.qdoc +++ b/src/bluetooth/doc/src/bluetooth-index.qdoc @@ -45,10 +45,13 @@ for transferring data between devices. Bluetooth connectivity is based on basic device management, such as scanning for devices, gathering information about them, and exchanging data between them. -Qt 5.5 contains the first full release of the new Qt Bluetooth -Low Energy API. Further details can be found in the +Qt Bluetooth supports Bluetooth Low Energy development for client/central role use cases. +Further details can be found in the \l {Bluetooth Low Energy Overview}{Bluetooth Low Energy Overview} section. +A new addition in this Qt Bluetooth 5.7 release covers support for Bluetooth Low Energy +applications performing the peripheral/server role. This new API is a Technology Preview. + \section1 Getting Started To use the C++ library in your application, add the following configuration -- cgit v1.2.3 From b02fb0a3d30819d783e49f7b84b2459fad147158 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 19 May 2016 13:44:30 +0200 Subject: Add changelog for Qt 5.7.0 release Change-Id: Ic683b32daa35fc771f848046b26fd6edfdaaa0c7 Reviewed-by: Christian Kandeler --- dist/changes-5.7.0 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 dist/changes-5.7.0 diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0 new file mode 100644 index 00000000..44552132 --- /dev/null +++ b/dist/changes-5.7.0 @@ -0,0 +1,39 @@ +Qt 5.7 introduces new features and improvements as well as bugfixes +over the 5.6.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.7 series is binary compatible with the 5.6.x series. +Applications compiled for 5.6 will continue to run with 5.7. + +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 +----------- + + - Added API for Bluetooth Low Energy Peripheral support. This new API is + a Technology Preview and currently only supported on BlueZ. + - [QTBUG-52428] Added QLowEnergyConnectionParameters class to enable + adjustment of BTLE connection parameters + - Added operator!= for QBluetoothUuid + - Added Bluetooth Low Energy signed write support on Linux/BlueZ and Android + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +iOS/tvOS +-------- + + - Added support for QtBluetooth on tvOS. -- cgit v1.2.3 From 266fdc0839eda6e6ba66d7e81aceaea32160bdee Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 19 May 2016 11:35:13 +0200 Subject: Add missing documentation to BTLE overview documentation The documentation was not complete as BTLE service definition and interaction was still missing. Those components are new in Qt 5.7. Change-Id: Ifd9057d659e541a853eeb49d03d46bfe9c2d4da4 Reviewed-by: Leena Miettinen --- src/bluetooth/doc/src/bluetooth-le-overview.qdoc | 55 ++++++++++++++++++------ 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc index dc884a79..8e78c487 100644 --- a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc +++ b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc @@ -168,18 +168,6 @@ Low Energy devices. The example code below is taken from the \l {heartlistener}{Heart Listener} and \l {heartrate-server}{Heart Rate Server} examples. - \section2 Advertising Services - - If we are implementing a GATT server application on a peripheral device, we need to define the - services we want to offer to central devices and advertise them: - - \snippet heartrate-server/main.cpp Advertising Data - \snippet heartrate-server/main.cpp Start Advertising - - Now potential clients can connect to our device, discover the provided service and - register themselves to get notified of changes to the characteristic value. - This part of the API is covered in the following sections. - \section2 Establishing a Connection To be able to read and write the characteristics of the Bluetooth Low Energy peripheral device, @@ -256,4 +244,47 @@ Low Energy devices. \l {https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx}{Bluetooth SIG} whereas others may follow a custom protocol. The above code snippet demonstrates how to the read the standardized HeartRate value. + + \section2 Advertising Services + + If we are implementing a GATT server application on a peripheral device, we need to define the + services we want to offer to central devices and advertise them: + + \snippet heartrate-server/main.cpp Advertising Data + \snippet heartrate-server/main.cpp Start Advertising + + Now potential clients can connect to our device, discover the provided service and + register themselves to get notified of changes to the characteristic value. + This part of the API was already covered by the above sections. + + \section2 Implementing a Service on the Peripheral Device + + The first step is to define the service, its characteristics and descriptors. This is achieved + using the \l QLowEnergyServiceData, \l QLowEnergyCharacteristicData and + \l QLowEnergyDescriptorData classes. These classes act as containers or building blocks for the + essential information that comprises the to-be-defined Bluetooth Low Energy service. + The code snippet below defines a simple HeartRate service which publishes + the measured beats per minute. An example where such a service could be used is a wrist watch. + + \snippet heartrate-server/main.cpp Service Data + + The resulting \c serviceData object can be published as described in the + \l {Advertising Services} section above. Despite the partial information overlap between the + information wrapped by \l QLowEnergyServiceData and \l QLowEnergyAdvertisingData the two classes + serve two very different tasks. The advertising data is published to nearby devices and often + limited in scope due to its size restriction of 29 bytes. Therefore they are not always 100% + complete. By comparison the service data contained inside of \l QLowEnergyServiceData provides + the complete set of service data and only becomes visible to the connecting client when a + connection with an active service discovery has been performed. + + The next section demonstrates how the service can update the heart rate value. Depending on the + nature of the service it may have to comply with the official service definition + as defined on \l {https://www.bluetooth.org}. Other services may be completely custom. The + heart rate service was adopted and its specification can be found under + \l {https://www.bluetooth.com/specifications/adopted-specifications}. + + \snippet heartrate-server/main.cpp Provide Heartbeat + + In general characteristic and descriptor value updates on the peripheral device use the same + methods as connecting Bluetooth Low Energy devices. */ -- cgit v1.2.3 From 23a207fb56bf21aeb598ddd914159333f28f8a00 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 1 Jun 2016 16:43:09 +0200 Subject: Doc: Add thumbnail for Bluetooth Low Energy Heart Rate Server Example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this fix Qt Creator tags the example "broken". Change-Id: I193177bca1e0c8615e46a67e76afc98d935e590b Reviewed-by: Alex Blasche Reviewed-by: Topi Reiniö --- src/bluetooth/doc/qtbluetooth.qdocconf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bluetooth/doc/qtbluetooth.qdocconf b/src/bluetooth/doc/qtbluetooth.qdocconf index 52061d7e..aa485cdb 100644 --- a/src/bluetooth/doc/qtbluetooth.qdocconf +++ b/src/bluetooth/doc/qtbluetooth.qdocconf @@ -47,6 +47,7 @@ exampledirs += ../../../examples/bluetooth \ snippets/ \ ../ +manifestmeta.thumbnail.names = "QtBluetooth/Bluetooth Low Energy Heart Rate Server Example" imagedirs += images -- cgit v1.2.3 From 344583c3994048fbc7757c4e2abb647329eadbf3 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 8 Jun 2016 12:33:35 +0200 Subject: Mention license change in 5.7.0 changelog. Task-number: QTBUG-53913 Change-Id: I0bd8a21a01531d530ba09d94a6fb839c4e43c630 Reviewed-by: Sami Makkonen Reviewed-by: Jani Heikkinen --- dist/changes-5.7.0 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0 index 44552132..1beb80af 100644 --- a/dist/changes-5.7.0 +++ b/dist/changes-5.7.0 @@ -1,6 +1,8 @@ -Qt 5.7 introduces new features and improvements as well as bugfixes -over the 5.6.x series. For more details, refer to the online documentation -included in this distribution. The documentation is also available online: +Qt 5.7 introduces many new features and improvements as well as bugfixes +over the 5.6.x series. Also, there is a change in the licensing terms. +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 @@ -15,6 +17,21 @@ corresponding to tasks in the Qt Bug Tracker: Each of these identifiers can be entered in the bug tracker to obtain more information about a particular change. +**************************************************************************** +* Important License Changes * +**************************************************************************** + + This module is no longer available under LGPLv2.1. The libraries are + now available under the following licenses: + * Commercial License + * GNU General Public License v2.0 (LICENSE.GPL2) and later + * GNU Lesser General Public License v3.0 (LICENSE.LGPL3) + + The tools are now available under the following licenses: + * Commercial License + * GNU General Public License 3.0 (LICENSE.GPL3) with exceptions + described in The Qt Company GPL Exception 1.0 (LICENSE.GPL3-EXCEPT) + **************************************************************************** * Library * **************************************************************************** -- cgit v1.2.3 From 7b4d1325ecf41ed76a5beca584702ccb5a9b5d6d Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 9 Jun 2016 16:45:10 +0200 Subject: Bluetooth - remove duplicated class definition (iOS) qbluetoothdevicediscoveryagent_p.cpp not needed on iOS, since for iOS we already have iOS-specific version defined completely in the corresponding .mm file. This is quite obvious ODR violation, but not so obvious for compiler/linker apparently. Change-Id: I7b7d0c9596cccea307ec7acbafbb6cd31b41d885 Reviewed-by: Alex Blasche --- src/bluetooth/bluetooth.pro | 1 - src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 89839be1..d5a12d00 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -168,7 +168,6 @@ config_bluez:qtHaveModule(dbus) { include(osx/osxbt.pri) SOURCES += \ - qbluetoothdevicediscoveryagent_p.cpp \ qbluetoothlocaldevice_p.cpp \ qbluetoothserviceinfo_p.cpp \ qbluetoothservicediscoveryagent_p.cpp \ diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp index 81e57881..963eb368 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp @@ -36,9 +36,7 @@ #include "qbluetoothaddress.h" #include "qbluetoothuuid.h" -#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" -#endif #define QT_DEVICEDISCOVERY_DEBUG @@ -52,9 +50,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate( q_ptr(parent) { Q_UNUSED(deviceAdapter); -#ifndef QT_IOS_BLUETOOTH printDummyWarning(); -#endif } QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate() -- cgit v1.2.3 From 7b1999084dac22a96867c00a22228000057c2276 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Wed, 15 Jun 2016 08:37:41 +0800 Subject: Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: If8088468d74b1d5ca87ccb82ce294396383401d1 Reviewed-by: Alex Blasche --- LICENSE.GPLv2 | 2 +- LICENSE.GPLv3 | 2 +- LICENSE.LGPLv21 | 2 +- LICENSE.LGPLv3 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2 index 6dbb032f..a4244777 100644 --- a/LICENSE.GPLv2 +++ b/LICENSE.GPLv2 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU General Public License version 2, which is displayed below. ------------------------------------------------------------------------- diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 index 4e49b122..71c4ad49 100644 --- a/LICENSE.GPLv3 +++ b/LICENSE.GPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3. That license references the General Public License version 3, that is displayed below. Other portions of the Qt Toolkit may be licensed directly under this license. diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 6e184611..dfcab5e2 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. ------------------------------------------------------------------------- diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 4d67bac0..6bf924cd 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. This license makes reference to the version 3 of the GNU General Public License, which you can find in the LICENSE.GPLv3 file. -- cgit v1.2.3 From 7d4f6cab9fc5c8a8061b13e9b15bacf17e7e7b4c Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 16 Jun 2016 15:10:50 +0200 Subject: Fix build error on Linux using clang/trunk It seems clang trunk cannot distinguish std::bind from bind() in sys/socket.h. There is no apparent std namespace usage but clang still complains. This patch resolves the disambiguity. Task-number: QTBUG-53683 Change-Id: Ib4bbe4a4cdf679fa3314abba5970968d7d8a9857 Reviewed-by: Christian Kandeler Reviewed-by: Timur Pocheptsov --- src/bluetooth/lecmaccalculator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bluetooth/lecmaccalculator.cpp b/src/bluetooth/lecmaccalculator.cpp index 1cda9576..47fef7df 100644 --- a/src/bluetooth/lecmaccalculator.cpp +++ b/src/bluetooth/lecmaccalculator.cpp @@ -72,7 +72,7 @@ LeCmacCalculator::LeCmacCalculator() sa.salg_family = AF_ALG; strcpy(reinterpret_cast(sa.salg_type), "hash"); strcpy(reinterpret_cast(sa.salg_name), "cmac(aes)"); - if (bind(m_baseSocket, reinterpret_cast(&sa), sizeof sa) == -1) { + if (::bind(m_baseSocket, reinterpret_cast(&sa), sizeof sa) == -1) { qCWarning(QT_BT_BLUEZ) << "bind() failed for crypto socket:" << strerror(errno); return; } -- cgit v1.2.3 From a8a1a97b9a3f68245431a94ff670b91b340770b2 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 16 Jun 2016 15:40:52 +0200 Subject: Make QtBluetooth compile in setups with BlueZ version w/o BTLE support Task-number: QTBUG-54055 Change-Id: Id2c42efe6c916b6f7437cb4c02fbb19430c9a44b Reviewed-by: Timur Pocheptsov Reviewed-by: Christian Kandeler --- src/bluetooth/bluetooth.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index d5a12d00..bbda8acd 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -91,6 +91,7 @@ config_bluez:qtHaveModule(dbus) { message("Bluez version is too old to support Bluetooth Low Energy.") message("Only classic Bluetooth will be available.") DEFINES += QT_BLUEZ_NO_BTLE + include(dummy/dummy.pri) SOURCES += \ qlowenergycontroller_p.cpp } -- cgit v1.2.3