summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix tr()-context in src/bluetooth/qbluetoothservicediscoveryagent_qnx.Friedemann Kleint2014-09-291-1/+1
| | | | | Change-Id: I161cac536d261c517a8323777561f8380b7d4bfb Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX/BB10 fix build failureWolfgang Bremer2014-09-221-1/+1
| | | | | | | service was not declared, it should be lowEnergyService Change-Id: I1419dbaa865b0bcce51ad2e8cf13c24cef40f1fa Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Set ATT as protocol descriptor for BTLE SDP recordsAlex Blasche2014-09-031-3/+14
| | | | | | | | At the same time we fix up some cases where the ProtocolDescriptorList was not a list within a list. Change-Id: If0ec6cf6374902a47a905edd08523906be9fd86b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove QLowEnergyServiceInfoAlex Blasche2014-09-031-4/+22
| | | | | | | | 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>
* Update license headers and add new licensesJani Heikkinen2014-08-241-18/+10
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I7a8b8b787fcae9a178794364efdefe1021d10b1b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove old GATT APIAlex Blasche2014-07-231-1/+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>
* Merge branch 'dev' into btleAlex Blasche2014-05-261-15/+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
| * Code cleanup: Avoid repeated service info duplication checkAlex Blasche2014-05-231-12/+1
| | | | | | | | | | Change-Id: I00701e9103a6acfdfc2697949280f8a7de8bcdfe Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Utilize QStringLiteral where possibleAlex Blasche2014-05-151-2/+2
| | | | | | | | | | | | | | | | The only exception are generated files and cases where QLatin1String based overloads are used (e.g. during QString comparisons) Change-Id: I6f36789fb8acb3b30c1dc1f8a920b118a979d74f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | QNX service discovery for dual mode devices fixNedim Hadzic2014-03-061-8/+11
| | | | | | | | | | | | | | | | | | | | For devices which have standard and LE services LE services were not read. Discovery of all custom services implemented. Change-Id: I41c89d8d4ea442153c12cd647fd2cd1a6dd7f0f7 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Renaming QLowEnergyServiceInfo methodsNedim Hadzic2014-02-211-1/+1
| | | | | | | | | | | | | | | | | | Ensures that QLowEnergyServiceInfo and QBluetoothServiceInfo are more alike. Tests and examples updated as well. Change-Id: I0f6a97900891a9673f99578bdc8d156a8c403513 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Remove remaining QBBBluetoothDebug statementsAlex Blasche2014-02-191-2/+2
| | | | | | | | | | | | Change-Id: I5c8fae0b6546cb1e6907566f3f95b26cdf1ded11 Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge branch 'dev' into btleAlex Blasche2014-02-171-33/+44
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * Adjust strings for translationAlex Blasche2014-02-131-5/+5
| | | | | | | | | | | | | | | | This includes unification of error messages, fixes for spelling mistakes, hints for translators and other forms of simplifications. Change-Id: Idd0e01614b24ff2d19133f0d19d49649d59e3f57 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-101-2/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: Ic9e5cb3989426b90f6dad58d53dba366638ff35f
| | * Fix remaining compiler warnings in QtConnectivity moduleFabian Bumberger2014-01-071-2/+2
| | | | | | | | | | | | | | | Change-Id: Iafadb39642c6b2944e8a873bdee49fb87e3ed5e9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | BlackBerry: Fix compilationSergio Ahumada2014-01-081-5/+5
| | | | | | | | | | | | | | | | | | | | | qBBBluetoothDebug was removed by 94f862e2 Change-Id: I85eca3bfbec2190f8a7413ec708d5bf99bc6998a Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * | Fix remaining uncategorized debug/warning messages (catchup in dev)Alex Blasche2014-01-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial change was done in stable. After merging it to dev new code paths required a similar treatment. Task-number: QTBUG-32253 Change-Id: I745928f28c35ce9c0e601df6e11eb21c9f17ca7a Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-14/+13
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothlocaldevice_qnx.cpp src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: If7dd968047fec5352567e9b67ca5b8e680c7523d
| | * Translate so far untranslated error strings.Alex Blasche2013-12-201-3/+3
| | | | | | | | | | | | | | | | | | Change-Id: I7d91404052ce987ea700e698c024475211bad025 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Use QLoggingCategory to categorize the various debug output streamsAlex Blasche2013-12-201-11/+11
| | | | | | | | | | | | | | | | | | | | | 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 devFrederik Gladhorn2013-12-051-4/+4
| |\| | | | | | | | | | Change-Id: I3ca73a1a829da2c2ee87e5d980165ef867d2f1b9
| | * QNX: Fix a dangling pointer use in QBluetoothServiceDiscoveryAgent on QNXRobin Burchell2013-12-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | toUtf8 returns a temporary, we must not use a pointer inside it without making sure that the QByteArray returned sticks around. Change-Id: I4566d14f52acac083433dfe63c64365d119bbd17 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Implemented Bluetooth Low Energy gatt service and characteristics discoveryNedim Hadzic2013-11-041-27/+64
|/ / | | | | | | | | | | | | | | | | 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>
* | Merge branch 'stable' into devAlex Blasche2013-10-221-7/+18
|\| | | | | | | Change-Id: I47daf8e94c809bd2786ad27cc56367da839504a0
| * QNX: Fix socket connection with a service info objectFabian Bumberger2013-10-011-2/+6
| | | | | | | | | | Change-Id: Ib33787c849ba4370bb9e99a6cc50ce30ce216f0c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * QNX: Fix uuid filter in service discoveryFabian Bumberger2013-09-301-1/+1
| | | | | | | | | | Change-Id: I5493be50f66cf8df8fac1177b885c395a6d697b6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Don't throw an error when a low energy device is discoveredFabian Bumberger2013-09-301-4/+11
| | | | | | | | | | | | | | Just ignore it Change-Id: I7d8139f8c10cee0df4e2ebdc13bb76ee6bb8dda3 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Implemented new approach for Bluetooth service discoveryNedim Hadzic2013-10-211-1/+122
|/ | | | | | | | 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>
* Refactor device and service discovery errorsFabian Bumberger2013-09-201-5/+5
| | | | | | | | - Make them more consistent with other Qt modules - Propagate the error during device discovery to the QBluetoothServiceDiscoveryAgent Change-Id: Idcd3e0e6061b85e8b6adad248625740f3b91289a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix compilation and a compiler warningFabian Bumberger2013-09-201-1/+1
| | | | | Change-Id: Id3de289238013edfc9737f444d3db95be3bd761b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove QtBluetooth and QtNfc namespace.Alex Blasche2013-09-091-2/+2
| | | | | | | | This is based on namespace discussions on the Qt project dev mailing list. We continue to use the Qt namespace. Change-Id: I6119d06662f7682c11f42d759f3218be1f5a7d6c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make Bluetooth adapter choosable for device and service searchNedim Hadzic2013-09-051-2/+2
| | | | | | | | | | | | | | | | | In case there are more Bluetooth adapter, device and service search might give different results. Addition to Change-Id: Ideddb39460985c18547baec986b15e43946c85de - added option for setting the device adapter for service search. QBluetoothLocalDevice was used in both classes (device and service search) for passing an argument for setting adapter. The reason for this to keep the same approach, because in QBluetoothServiceDiscoveryAgent class there is already a constructor with QBluetoothAddress argument. Auto tests and examples updated. Change-Id: Ib5d7ff23e4846d9d42dae68d8d424031748811e5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Bugfixes for the service discovery agentFabian Bumberger2013-08-261-7/+32
| | | | | Change-Id: I8d977eb9013a9fa98427080baac1df881985d961 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Rename NFC and Bluetooth namespace macros.Aaron McCarthy2013-02-141-2/+2
| | | | | | | | 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>
* SPP service uuid was not parsed correctlyFabian Bumberger2012-11-301-1/+1
| | | | | Change-Id: I4ad2a72d0877a6e2109023ddfb47d345bbab3688 Reviewed-by: Peter Hartmann <phartmann@rim.com>
* QNX fix compilation errorFabian Bumberger2012-11-301-1/+5
| | | | | | | Forgot to add 2 files in the previous commit Change-Id: I9db68dcd4011779630419b835ce440485a66c63f Reviewed-by: Peter Hartmann <phartmann@rim.com>
* QNX making the device discovery agent more robustFabian Bumberger2012-11-271-4/+14
| | | | | Change-Id: Ibb7da66092e0edca9ac3d7e801275de5d166d6d8 Reviewed-by: Alex <ablasche@gmail.com>
* QNX adding bluetooth service discovery agentFabian Bumberger2012-11-221-0/+202
Change-Id: I56ed0b2473318046fd34f156d49aac33ffcf5738 Reviewed-by: Alex <ablasche@gmail.com>