summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/bluetooth.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove QLowEnergyServiceInfoAlex Blasche2014-09-031-3/+0
| | | | | | | | There is no need for this class anymore as QBluetoothServiceInfo covers the same information. Change-Id: I411a8abb68b34a3a4893a67ee9fac096f44bbd62 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'gerrit/5.4' into btleAlex Blasche2014-08-131-2/+0
|\ | | | | | | Change-Id: I1e79c96602d0da2c2d36d6217bdfe7ff183e6df9
| * Remove Bluez as link and include dependency from QtBluetoothAlex Blasche2014-08-121-2/+0
| | | | | | | | | | Change-Id: Ieecf341918ffdc51c359fed4969ef6c3998d83b8 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | Rename QLowEnergyControllerNew -> QLowEnergyControllerAlex Blasche2014-07-231-8/+8
| | | | | | | | | | | | | | | | Moves the new API into its place and completes the removal of the old API. Change-Id: I10a285e24e288aeb747cb1606574e27a4bf57308 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Further cleanup QLowEnergyServiceInfoAlex Blasche2014-07-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removes obsolte code from the previos GATT API and other API elements which do not make any sense under the new API anymore. The entire purpose of QLowEnergyServiceInfo is also in question as it doesn't really contain BTLE specifics when compared to QBluetoothServiceInfo. This requires further API evaluation. Change-Id: Idfce724bb58150839f756745b87864054909dedb Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Remove old GATT APIAlex Blasche2014-07-231-25/+0
| | | | | | | | | | | | | | | | | | The subsequent patches will rename QLowEnergyControllerNew to QLowEnergyController and fix up the documentation fragments which still point to the old API. Change-Id: I084e6b1a85a17f424702018f3ad7047bda35d46a Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Introduce QLowEnergyDescriptorAlex Blasche2014-06-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The class is based in QLowEnergyDescriptorInfo and exposes the found descriptor information. The only missing piece of information is the descriptor value. Extends the QLowEnergyController unit test in such a way that descriptor information is tested too (except for values). Change-Id: I6ba6a862fff48fbdd27cd8219d2eb8f6d0058aea Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | First pass on an updated QLowEnergyCharacteristic classAlex Blasche2014-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch creates QLECharacteristic based on the old QLECharacteristicInfo class. Some details have been removed since they no longer apply and the class has been integrated into QLEService QLEControllerNew and its data store. This is still work in progress and the unit tests must still be modified but it's already functional. Change-Id: Id80c4f01fffd77cd225b49753c74c3336f8e127e Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Unify the shared data types between controller and service classAlex Blasche2014-06-191-2/+5
| | | | | | | | | | | | | | This reduces the overhead and simplifies the data structures Change-Id: Iddf184a6d3de5ac253c889f2223a09f2fe08ce15 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Push improved API.Alex Blasche2014-06-171-0/+2
| | | | | | | | | | | | | | | | | | QLowEnergyService represents each single service on the remote BTLE device. QLowEnergyControllerNew acts as factory for QLowEnergyService instances. Change-Id: I07c6bfae6d14b73a80e8314f6e8471285fccf069 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Provide guarding against non-BTLE enabled versions of BluezAlex Blasche2014-06-161-5/+21
| | | | | | | | | | | | | | | | | | | | This disables the gatttool based controller as well. While it might compile on older systems they are likely to not have a gatttool and why would a Bluez version without BTLE symbols ever work anyway. Change-Id: I761e482d3dd1e99008c5d170053e19a1a3a51e6c Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Create 2nd version of QLowEnergyController and add related unit testAlex Blasche2014-06-161-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Bluez implementation is the only working implementation for BTLE. However the current approach of using gatttool via QProcess is not viable going forward. The tool output is not standardized, the Bluez developers don't recommend it for anything but debugging and some Linux distros don't even ship it. Since Bluez does not have any high level API for BTLE GATT we have to use L2CP sockets to communicate with the GATT server of the peer device. The current QLowEnergyController API needs a lot of API changes going forward as some elements cause problems in the long term. In summary we need a new internal implementation and a new API for QLowEnergyController. It is far too much effort to change both elements at the same time. Hence QLowEnergyControllerNew was added with first simple API elements. Ultimately it should replace the existing class. For now the old API stays as is for reference purposes. All other BTLE classes work just fine for now. Last but not least a unit test was added. The test assumes the existence of the TI Sensor tag and verifies all its known characteristics and descriptors. Ultimately it will help to verify the proper detection of all details. Right now the test detects all services and characteristics but not all descriptors. Change-Id: I6ff1a16da1604be57f5564ae99919ffe7187d02e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge branch 'dev' into btleAlex Blasche2014-05-261-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/bluetooth/bluetooth.pro src/bluetooth/bluez/bluez.pri src/bluetooth/doc/src/bluetooth-index.qdoc src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp src/bluetooth/qbluetoothdeviceinfo.cpp src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp src/bluetooth/qbluetoothservicediscoveryagent_p.h src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: I88b22c51a4ee95b067ef8d2b2fddb5cbff4566f8
| * Service discovery via Bluez5Alex Blasche2014-05-221-0/+2
| | | | | | | | | | | | | | | | | | At the same time we shift the ServiceClassUUID to service name mapping to QBluetoothUuid. It was used by Android and now Bluez 5 uses it too. Task-number: QTBUG-32085 Change-Id: I9f2d4dc4e2997683485f2ba7aaefb646cb72fb75 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Qt Bluetooth: Show correct names when compiling the moduleSze Howe Koh2014-03-181-2/+2
| | | | | | | | | | Change-Id: I5f761cb428514d56fc88cd27def92defd3b83dd8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | QNX BLE communication moved to controller classNedim Hadzic2014-03-141-1/+2
| | | | | | | | | | | | | | Moving communication with device to QLowEnergyController class. Change-Id: Id783d3aac81c215fbda7c1390bb2abf8ecd2fb2a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | BLE communication moved to controller classNedim Hadzic2014-03-111-3/+6
| | | | | | | | | | | | | | | | | | BLE communication code was implemented in QLowEnergyServiceInfo class. It is moved now to the QLowEnergyController class. Needed adjustments are done in order to make this work. Change-Id: I9206d2324ad59f79f4e035509e23f5c7f7cfb328 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Make android compile on BTLE branchAlex Blasche2014-02-201-1/+4
| | | | | | | | | | | | Change-Id: I43d143b9a6f64c59912d696f71820201e773479a Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Make compile default backendAlex Blasche2014-02-191-1/+0
| | | | | | | | | | | | Change-Id: Ib28e5a5a8b9c3363061e9d9e6e49f98cf55784b4 Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge branch 'dev' into btleAlex Blasche2014-02-171-2/+23
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/bluetooth/bluetooth.pro src/bluetooth/doc/src/examples.qdoc src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp src/bluetooth/qbluetoothservicediscoveryagent_p.h src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
| * Port QtBluetooth to AndroidAlex Blasche2014-02-131-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a feature merge to dev targeting Qt 5.3. Known issues: -QTBUG-36754: QBluetoothServer::close() crashes -QTBUG-36763: QBluetothTransferManager port to Android not possible -QTBUG-36764: Improve QBluetoothLocalDevice::connectedDevices() -QTBUG-36810: Remove direct use of Android action strings The above issues and some other minor TODO's will be addressed until final release time. Task-number: QTBUG-33792 [ChangeLog][QtBluetooth][Android] QtBluetooth has been ported to Android. Change-Id: I31ba83e3b7d6aa68e7258b7e43235de7d1a6e68a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothlocaldevice_qnx.cpp src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: If7dd968047fec5352567e9b67ca5b8e680c7523d
| | * Use QLoggingCategory to categorize the various debug output streamsAlex Blasche2013-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32253 Change-Id: I193162407d0fc7eca83689e31f03e1641a494ab0 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-081-1/+1
| |\| | | | | | | | | | Change-Id: I21c1c1bc2cffde68bb13f56f08e10564464585c1
| | * Build Bluetooth and NFC only for BlackberryAndreas Holzammer2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Plain QNX does not need to have Bluetooth and/or NFC. Change-Id: I6323d03292a2b72d21f8d947bb58205648cb0061 Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Fixed couple minor things for QNX platformNedim Hadzic2014-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Connecting error signals in QLowEnergyController, deleting pointers in descructor in QLowEnergyProcess and added loading btapi for QNX platform. Change-Id: I8785583e38b4e9eaa7b2cf1103df4ab206392a5a Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Additional constructors to QLowEnergyDescriptorInfo class and method ↵Nedim Hadzic2013-11-111-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | modification in QLowEnergyCharacteristicInfo class. Characteristic notification change and solving the warnings were implemented. Change-Id: I8abec8b580e477578b4bc1dfd1e92e838ef7a372 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Implemented Bluetooth Low Energy gatt service and characteristics discoveryNedim Hadzic2013-11-041-7/+33
|/ / | | | | | | | | | | | | | | | | Bluez v4.x does not have total support for LE devices, a new approach, using gatttool command was implemented. Auto-tests and documentation will be in other commits. Change-Id: Iee711cc111199e15956052eebb7593bd3a5e27c8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Implemented new approach for Bluetooth service discoveryNedim Hadzic2013-10-211-0/+1
| | | | | | | | | | | | | | | | Using bt_rdev_sdp_search_async function from NDK btdevice.h header. This will provide option to obtain more information about the service for 10.2.1 NDK and image versions. Change-Id: I372ebc0247a8474360ac291fe0215b6a0be59a15 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Introduce compile test for BT API 10.2.1Fabian Bumberger2013-10-171-0/+4
|/ | | | | Change-Id: If4d805f49666cf9d09cc82c377f96398b7d4039c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Simplify QBluetoothTransferManager code.Alex Blasche2013-09-201-5/+2
| | | | | | | | | QBluetoothTransferManager implementation is very simple. There is no need for three individual files. Change-Id: Ia205f96c4b59366f6b9613a7b45f2836a93a03e6 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Merge QRfcommServer and QL2capServer to QBluetoothServerFabian Bumberger2013-08-291-13/+7
| | | | | | | Task-number: QTBUG-32722 Change-Id: Ia75ad5af2f81b737a8cca09dba919a7dc0fa0f8a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Change name of platform define to QT_QNX_BLUETOOTHFabian Bumberger2013-08-231-1/+1
| | | | | | | To be aligned with the bluez implementation Change-Id: I8d3fbd0c23298f984e2c99cbf4131cf8fc0a0a64 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX Bluetooth adding OPPFabian Bumberger2013-08-011-1/+7
| | | | | | | Makes it possible to send QFiles over OPP. Other QIODevices do not work yet. Change-Id: I3a85a1f4a95c9059143f20d01c20ac27961e4a09 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Removing QRfcommSocket and QL2capSocketFabian Bumberger2013-07-301-4/+0
| | | | | | | The symbols of these classes are not exported and they are not needed anywhere. Change-Id: Ie668d0b26e7df29c31fb471f0c4f6e9beae90a9b Reviewed-by: Alex <alexander.blasche@digia.com>
* Rename NFC and Bluetooth namespace macros.Aaron McCarthy2013-02-141-0/+1
| | | | | | | | Renamed to the namespace macros to follow what syncqt expects. This fixes missing namespace macro warnings printed by syncqt. Change-Id: I7be5a700e8435a559cb4c2e74938851233095887 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* Modularise documentation.Aaron McCarthy2013-01-301-1/+2
| | | | | | | | | | Qt Bluetooth documentation had been modularised but it was still building using the old version. Use the qtbluetooth.qdocconf instead. Modularise the Qt NFC Documentation. Change-Id: Idea1631645bf21750254eddc1c41a4f819ac5156 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-041-1/+1
| | | | | | Change-Id: I810dc7b5863c1674390a7e471845f1779cbba98c Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix docs build: canonical naming of qdocconf fileOswald Buddenhagen2012-12-031-1/+1
| | | | | Change-Id: I8184712d60c8c3c7ed6a03d47188c19f3803c628 Reviewed-by: hjk <qthjk@ovi.com>
* QXN Adding service infoFabian Bumberger2012-11-231-4/+4
| | | | | | | I also had to move the qbluetoothserviceinfo_p.h to the global header files Change-Id: Id394c09f7d6d3daf4d86a2e6a54a4a3a34aa73cc Reviewed-by: Alex <ablasche@gmail.com>
* QNX: Adding SPP supportFabian Bumberger2012-11-231-2/+2
| | | | | | | This commit adds the SPP server and socket to the QNX Bluetooth port Change-Id: I0868f4cbc32fc84f0688eafdd2c3350dc8506b65 Reviewed-by: Alex <ablasche@gmail.com>
* QNX adding bluetooth service discovery agentFabian Bumberger2012-11-221-1/+1
| | | | | Change-Id: I56ed0b2473318046fd34f156d49aac33ffcf5738 Reviewed-by: Alex <ablasche@gmail.com>
* QNX adding device discovery agentFabian Bumberger2012-11-221-1/+1
| | | | | Change-Id: Id21ee613489c7b7079a32812340046443d4868a9 Reviewed-by: Alex <ablasche@gmail.com>
* QNX: Adding the local bluetooth deviceFabian Bumberger2012-11-221-2/+2
| | | | | | Change-Id: I44d7c6ccf16fb8f537f7f4627d4a6cd42ffd0fdd Reviewed-by: Mehdi Fekari <mfekari@rim.com> Reviewed-by: Alex <ablasche@gmail.com>
* Preparing the QNX bluetooth portFabian Bumberger2012-11-221-0/+15
| | | | | | | This commit includes a backend for processing pps commands. Change-Id: I4fb720167bbf6cecaa06a8e46d3407ea70745b28 Reviewed-by: Alex <ablasche@gmail.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-111-2/+2
| | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. Change-Id: I518a65bf465c228a506d772d3dcffcd999e41d0f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: I7f6eeb8a129775c1b6616531e6ed05cb0e0b7bd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make use of QT_PRIVATE to specify private Qt dependenciesv5.0.0-beta1Oswald Buddenhagen2012-08-111-3/+1
| | | | | Change-Id: Idb2ac7ee69eba085f600b422628dc42a7dc87711 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: If8a6586e517e1628be34540f24fe3b72f53714a7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Use the recommended way of building module docs.alex2012-06-271-0/+2
| | | | | Change-Id: I57e6dd9b7323e8feaa2f7ed1bee0e24518f2b91e Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>