summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix for enabling BLE notifications on Linux implementedNedim Hadzic2014-02-211-2/+2
| | | | | | | | | For some devices it was not possible to enable notification because of the if clause. One warning in the constructor fixed. Change-Id: Ic11ce4109829eeb2022490f256f4e873ef3073a5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Heart Listener example addedNedim Hadzic2014-02-2127-1/+1826
| | | | | | | | | | | Bluetooth Low Energy example for connecting and receiving measurements from the heart belt. Documentation added too. [ChangeLog][QtBluetooth] Heart Listener Bluetooth Low Energy heart belt example has been added Change-Id: I1b690827af85411c962eb09aa87936f1fb7d9246 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QBluetoothDeviceInfo coreConfiguration fix implementedNedim Hadzic2014-02-211-3/+3
| | | | | | | Order of device configuration changed. Change-Id: Ie8287958bef6eefa4d821d0f6199347bb38cc8c4 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix some BTLE service discovery issuesAlex Blasche2014-02-203-19/+37
| | | | | | | | | | | | | 1.) In Bluez avoid incomplete and/or premature finish of service discovery process. 2.) Add Testcode for QBluetoothServiceInfo::serviceDiscovered(QLowEnergyServiceInfo) to bttestui application Change-Id: I037a6303862dcf2e29aef4b761731b13c85b29aa Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Show characteristic values with proper encoding in LEscanner exampleAlex Blasche2014-02-202-4/+6
| | | | | | Change-Id: I7f5fceae5d47e62d9b26fbced0cf73abe8d18d23 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Use proper include syntax for public headersAlex Blasche2014-02-204-19/+14
| | | | | | | | This fixes all qmake warnings. Change-Id: Ib103f0513ad0285ed55b45f7067742aaddd9cd58 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Remove all compiler warnings.Alex Blasche2014-02-202-4/+6
| | | | | | | Change-Id: I8322ce0db87aec86cd1341bb49198d812e969122 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> 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>
* Remove unnecessary stdin.h include which was not even using std notationAlex Blasche2014-02-201-1/+0
| | | | | | Change-Id: Ic17e632c9a88a187a072e914fd0fd5c97a935fe6 Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix broken namespace build of QtConnectivityAlex Blasche2014-02-202-1/+5
| | | | | | | Change-Id: I434a80b6ac32524fa429e94c16f663c81f90003c Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix broken QBluetoothDeviceInfo unit test.Alex Blasche2014-02-201-1/+3
| | | | | | Change-Id: I1252a0c78f2b7026041a992bdb1deec3391386cc Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix incorrect license header.Alex Blasche2014-02-201-1/+1
| | | | | | Change-Id: If58d69ea4afb6418d60b3e0b6e9fef10ae09c055 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>
* Remove remaining QBBBluetoothDebug statementsAlex Blasche2014-02-193-49/+55
| | | | | | 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-17172-537/+9375
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Add extensive test application for QtBluetoothAlex Blasche2014-02-159-0/+1285
| | | | | | | | | | | | | | This application can be used to manually test most Bluetooth features. Change-Id: Ib7101ff2f5334026c67c2e00a852d6b10d4674e8 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into ↵Alex Blasche2014-02-154-5/+3
| |\ | | | | | | | | | refs/staging/dev
| | * Merge remote-tracking branch 'gerrit/stable' into devAlex Blasche2014-02-144-5/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothserver.cpp src/bluetooth/qbluetoothserver.h Change-Id: Ia99c341ab6b4fb30d9ceb9e4516c7083eed1c547
| | | * Fix missing QBluetoothSocket::state update after unsuccessful SDP searchold/5.2Alex Blasche2014-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When connectToService() triggers an SDP discovery the search may fail. At the beginning of the discovery the socket state was set to ServiceLookupState. This patch ensures that the socket state resets to Unconnected if the SDP discovery failed. Currently only Bluez uses this discovery mechanism and therefore is the only affected platform. Change-Id: I982dafc1f5466071bbf910ed3cf7cf7abda14fe4 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * Fix interaction with Android devicesAlex Blasche2014-02-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom uuid of a Serial port profile must be part of the service class property. This enables Android to find the custom uuid. Change-Id: Ibe0bfcfe6ba7fa6b72a979153afccf17d6b4eb83 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * Reduce debug output on BluezAlex Blasche2014-02-111-2/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I82459078c0510d27ae3611e2914b0ec36ff625ed Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| | | * Explicitly declare the parameter type of QBluetoothServer::error().Alex Blasche2014-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The connect signal has trouble deciding on the error type. Change-Id: I6efde7629af832f394b2ae9ba5a266e281a4a1aa Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * | | Fix namespaced buildsAlex Blasche2014-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems the logging frameworks function pointer creates errors on some compilers. Change-Id: I35d9b2bbc9817789bfd1eafa9c62d19ca72eda8c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * | | QNX: Config test for libbb2Fabian Bumberger2014-02-144-11/+85
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libbb2 is not available in a public NDK yet. In order to be able to compile NFC for BlackBerry 10 with a public NDK the BB10 implementation for the QNearfieldShareManager is only built if libbb2 is detected. Change-Id: Idd11d4584215fade91db9f79895f901547bce3ef Reviewed-by: Stuart Burge <sburge@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
| * | Fix qmake and compiler warningsAlex Blasche2014-02-142-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Public headers should not include local header files (qmake warning) and fix warning about unused parameter. Change-Id: Id12d2255f6011507649b25ed2bc74356e0f4538e Reviewed-by: Stuart Burge <sburge@blackberry.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * | Adjust strings for translationAlex Blasche2014-02-138-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Port QtBluetooth to AndroidAlex Blasche2014-02-1348-64/+4018
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add support for NFC file and data sharingStuart Burge2014-02-1317-8/+1778
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide ability to allow NFC enabled devices to exchange file and data content using a high-level API. [ChangeLog][QtNfc][General] A new NFC share API was added. The API provides sharing of NDEF messages and arbitrary files via NFC and may potentially use other communication protocols such as wifi or Bluetooth as part of its implementation. Change-Id: I878df1702ce4164384096d00e53dcd354d1bfafc Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * | Merge branch 'stable' into devAlex Blasche2014-02-076-27/+87
| |\| | | | | | | | | | Change-Id: I8765fee07cec0588a0336178300129b75c13c30a
| | * QBluetoothServer fixesAlex Blasche2014-02-073-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.) If QBluetoothServer::listen(QBluetoothUuid,QString) fails during service registration we have to ensure that the Server doesn't remain in listening state. 2.) 29de876f55dc96748fdca8dd3fef0c873791796f sets the socket descriptor to -1 when closing the QBluetoothSocket. QBluetothServer treats a value of -1 as error and aborts any call to listen(). This implies that any call to listen() after the first close() would always fail. This patch adds some redundancy and first tries to recreate the socket and only if the re-creation failed exists with an error. 3.) Catch case when user calls listen() on an already listening server. Documentation has been updated to document the behavior. Change-Id: I2df13500e74a9741017f7404f0e0c477c96d5356 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| | * Fix broken QBluetoothServiceInfo::serviceClassUuids() callAlex Blasche2014-02-073-19/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It never returned a valid entry due to wrong QVariant conversion. The patch changes the public header with a potential to break BC. A formerly inline function was reimplemented and is no longer inline. This should be safe though as older header versions can still use the previous implementation. Change-Id: If786a366e625a56810b8d4cc682b25d07f72f4e5 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into ↵Alex Blasche2014-02-0611-98/+143
| |\ \ | | | | | | | | | | | | refs/staging/dev
| | * | Merge remote-tracking branch 'gerrit/stable' into devAlex Blasche2014-02-0311-98/+143
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothservicediscoveryagent.cpp Change-Id: I52831fc8c69062e90c003836fd9402f19d6a0ba5
| | | * Use qt_error_string rather than strerror.Alex Blasche2014-01-303-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ide3f00cacd7a42e99823441a45609f8e50063fce Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * Synchronize setting of QBluetoothSocket's error string, code and signalAlex Blasche2014-01-303-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a few cases where errorString, error signal and error code where out of sync because one was set but not the other. This was addressed by unifying the usage pattern for error activation to a pattern where errorString is set and setSocketError() is called afterwards. Change-Id: Ibfb04772cf560936aa4ce8ea9643d6a410cc9ee2 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * Don't cache the QBluetoothSocket::localName() & peerName()Alex Blasche2014-01-293-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This affects Bluez only. The other platforms don't use this feature. The problem was triggered when connecting, disconnecting and connecting again to another device. localName() might change due to a different local Bluetooth adapter being used and peerName() is different anyway in such cases. Change-Id: I8983a355832cf4f4d9a654971c54f5624be288e6 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | | * Refine documentation for QBluetoothSocket::localXYZ() functions.Alex Blasche2014-01-281-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluez never returns anything until the connection has been established. BlackBerry and the future Android port are much quicker. Change-Id: Ic465a9b68176e7fff5f0c88b4fb602f8665f7197 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * Initialize QBluetoothSocket::socketError properly.Alex Blasche2014-01-282-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far the initial value is compiler dependent. In most cases this meant it was set to 0. However 0 is not even a valid QBluetoothSocket::SocketError enum value. The NoSocketError value is -2. Change-Id: Ieee4f7bd1c97d758295f4d0cc1297f62c114f4f3 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * Fix crash in Bluez implementation for QBluetoothSocketAlex Blasche2014-01-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal socket was closed but not reset to -1 after calling close() or abort(). As a consequence the subsequent connect() call crashed since internal socket notifier were invalid [ChangeLog][QtBluetooth][QBluetoothSocket] Fixed a crash in Bluez part of QBluetoothSocket() which was caused when triggered when calling the sequence connect() - abort() - connect(). Change-Id: I21b779c7808d0a5211df9e2481da28e2e9753ca9 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * Fix broken SDP discovery on QBluetoothSocketAlex Blasche2014-01-282-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ThHis is only used on Bluez at this stage. THe SDP agent was initialized with the local adapter being the remote address of the remote service. This could never work. The remote address is now properly set (being the handed over bt address to QBluetoothSocket::connectToService()). [ChangeLog][QtBluetooth][QtBluetoothSocket] Fixed incorrect invocation of QBluetoothDiscoveryAgent where the remote service address was incorrectly assumed to be the local Bt adapter address. This prevented the detection of the remote service. This bug only affects the Bluez backend. Change-Id: Ice2b9c351bfd42f1f4398b14ac68f76315f01fa8 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-01-271-10/+5
| | | |\ | | | | | | | | | | | | | | | Change-Id: I7e74e90225c27cb22e51c488a6a0e563359042fe
| | | | * Update changelog for 5.2.1v5.2.1Thiago Macieira2014-01-231-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie67e598578628663fff9cee7b0f82200f575f2b2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | | * | Fix crash during SDP discovery on BluezAlex Blasche2014-01-241-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stopping the discovery during an ongoing SDP search may cause a crash because discoveredDevices has been cleared although we still access the list later on. Even if list access wouldn't be required anymore there is no reason to continue the discovery. Entry guards for the involved slots were added. Additionally it revealed a memory leak which has been fixed Change-Id: I3fd3c99a82a9d7b61e853a3f9f3877b8ad7f6d41 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | | * | Stop SDP search if QML Model is turned offAlex Blasche2014-01-222-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far, we only ever disabled the device search. If a SDP discovery was running and we changed to device discovery the SDP discovery kept running in the background. Change-Id: I5f2cf88ecf7f9b5cfe2608e0ceda366b552982e5 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * | Add missing documentation for QQmlNdefRecord::Unknown enum value.Alex Blasche2014-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ida3f7816340f9379629e653abc5ef89f5aa38486 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * | Do not clear result lists while the SDP search is ongoing.Alex Blasche2014-01-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Or bad things will happen... Change-Id: I7df3925ff5d15f3f904f4dd38e24b247ec151fd1 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| | | * | Improve QBluetoothServiceDiscoveryAgent documentationAlex Blasche2014-01-201-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtBluetooth][QBluetoothServiceDiscoveryAgent] The QBluetoothServiceDiscoveryAgent class documentation has been improved. Change-Id: I5472e9ceda45d9bcf0634b5bf2cecf265986bc10 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| | | * | Cleanup dead code in Bluez SDP discovery backendAlex Blasche2014-01-201-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change tweaks the discovery debug output log too. Change-Id: I4ef3e2e8ebaf0d9e593eee35a669641e3914da01 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| | | * | Fix memory leaks in Bluez specific device and SDP discovery classes.Alex Blasche2014-01-202-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtBluetooth][Platform Specific Changes] Memory leaks fixed in Bluez device and service discovery implementations. Change-Id: Ibc7c883d42d81a97310ff44ba40ffa94c71f611f Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | | | Normalize signal & slot signatures in connectionThiago Macieira2014-02-034-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I50c4f66f30debd49c37109dd2460925dc22af605 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 20:00:21 +0000