summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-172-18/+5
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7295292bb7d9b5fc7eba8f099f4592b70de80d11
| | * Cleanup more duplicated code in SDP discovery class.Alex Blasche2014-01-171-16/+5
| | | | | | | | | | | | | | | Change-Id: I4b6be592204cc435bfec508725d64cb8f7529a3b Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | * Reduce SDP discovery debug output on BluezAlex Blasche2014-01-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Printing the entire SDP xml is just too verbose. This reduces the output by multiple pages. Change-Id: I08ffb7799f3c9f5a61de224e58e565719d44b81b Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Emit PoweredOffError if required during device discovery start on BluezAlex Blasche2014-01-161-0/+12
| | | | | | | | | | | | | | | | | | Change-Id: I12406b2a0fef831ed2e96340fac73156dfa71848 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Reset QML Bluetooth discovery model if an error occurred during device discoveryAlex Blasche2014-01-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is due to a behavior difference of the finished() signal between service and device discovery. Change-Id: I59d6358171275987f07f86a6da80e8435445fd0e Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * | Document a somewhat peculiar signal behavior mismatch during Bt discoveryAlex Blasche2014-01-152-3/+9
| | | | | | | | | | | | | | | Change-Id: I8f9ac85e7753a9d6142bbefcd0e4bcda09e0f3d8 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-108-25/+34
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: Ic9e5cb3989426b90f6dad58d53dba366638ff35f
| | * Use QLoggingCategory in Bluetooth QML import plugin.Alex Blasche2014-01-084-19/+30
| | | | | | | | | | | | | | | | | | | | | | | | Add some minor include cleanups as well. Task-number: QTBUG-32253 Change-Id: I2ccb813a9dd85ca16c1ed8aab962418df8157890 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | * Fix remaining compiler warnings in QtConnectivity moduleFabian Bumberger2014-01-073-4/+3
| | | | | | | | | | | | | | | Change-Id: Iafadb39642c6b2944e8a873bdee49fb87e3ed5e9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Don't set the internal service discovery state twice to the sameAlex Blasche2014-01-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | The first call is not necessary as nothing has changed in the meantime. Change-Id: I8db51fd725dd210b3d5c7b01d399d24877bf9b2f Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | BlackBerry: Fix compilationSergio Ahumada2014-01-082-8/+8
| | | | | | | | | | | | | | | | | | | | | 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-083-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0624-230/+197
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothlocaldevice_qnx.cpp src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: If7dd968047fec5352567e9b67ca5b8e680c7523d
| | * Translate so far untranslated error strings.Alex Blasche2013-12-203-7/+7
| | | | | | | | | | | | | | | | | | 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-2022-225/+188
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32253 Change-Id: I193162407d0fc7eca83689e31f03e1641a494ab0 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Improve error reporting.Alex Blasche2013-12-202-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever we emit an error, we should set the human readable error string in the discovery classes. [ChangeLog][QtBluetooth][Documentation] Fix cases where device and service discovery classes emitted an error signal but the human readable error string was not adjusted. Change-Id: I9680853d17d2ee4bc1293826bb7bf56cc999e2ed Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Improve and fix documentation for the Bluetooth discovery classes.Alex Blasche2013-12-202-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtBluetooth][Documentation] The documentation for the Bluetooth discovery classes has been improved. Change-Id: Id4366b491e8bbda8cf884b9ad3594dd89cc925e8 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Check the local adapter's BluetoothAdress before doing the discoveryFabian Bumberger2013-12-204-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-35571 Change-Id: I8f2eea7a8437787d61a238c760e948f45738618a Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * | Fix error state of default QBluetoothServiceDiscoveryAgentAlex Blasche2013-12-201-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-35571 Change-Id: I9f3ba17bac1559758dae3808310262c6356a91c2 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * | Fix active state of default implementation of QBluetoothServiceDiscoveryAgentFabian Bumberger2013-12-201-0/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-35571 Change-Id: Iecb959ece30b2af7340c3dfa9bf4b08c4004da14 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 QNX API for device "connected" statusNedim Hadzic2013-11-272-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | The feature allows to know whether QBluetoothLocalDevice is currently connected to any other device using connectedDevices() method for QNX platform. Change-Id: Id103f66321de52c2bc63e2bdbead85f11f9108a9 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-201-5/+3
| |\| | | | | | | | | | Change-Id: Id0725b35864eb7e99b9efaa3a014f0672f112f71
| | * Unwarn on clangv5.2.0-rc1v5.2.0Alex Blasche2013-11-111-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | qdeclarativebluetoothservice.cpp:279:14: warning: variable 'serverType' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] Change-Id: I67e6e58c7729d09492a7913e83b4bc94acf5d057 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Added new API for device "connected" statusOleksandr Matasov2013-11-126-1/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature allows to know whether QBluetoothLocalDevice is currently connected to any other device using connectedDevices() method. Change-Id: I4d1a19ebb0b42efd1fc5d5f0f9e7816aa956fbf4 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| * | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-084-5/+5
| |\| | | | | | | | | | Change-Id: I21c1c1bc2cffde68bb13f56f08e10564464585c1
| | * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I8ee21679bc4990bb8c81d8e4a7233d7ec2824ba7 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| | * Build Bluetooth and NFC only for BlackberryAndreas Holzammer2013-11-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
| | | | | | | | | | | | | | | Change-Id: I14e289bd44ab31fff081d5d63974e524232313a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Update NFC QML API meta data following recent 5.3 version changesAlex Blasche2013-10-231-3/+7
| | | | | | | | | | | | | | | | | | Change-Id: Ica03299c1eac726340035a63f2396bd282ab4d51 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Register NFC QML APIs as 5.3Alex Blasche2013-10-231-0/+5
| | | | | | | | | | | | | | | | | | Change-Id: I42d87994eeaa09f534b960725460666ebaebfa94 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Update Bluetooth QML API meta data following recent 5.3 version changesAlex Blasche2013-10-231-3/+4
| | | | | | | | | | | | | | | | | | Change-Id: I5d9c866ed2746da3d38c4b8785ce7bf6e61e1167 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Register Bluetooth QML APIs as 5.3Alex Blasche2013-10-231-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: Ie777523fe7bc482d0704a22f878b9abac09f5fbd Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Added class description.Nedim Hadzic2014-02-133-0/+40
| | | | | | | | | | | | | | | | | | | | | BLE info classes did not have basic description, which is added now. Change-Id: I5cc679ebe3ad0ae74c558cf0f782a9bf20ed8f21 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Fixed couple minor things for QNX platformNedim Hadzic2014-01-143-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Implemented Bluetooth Low Energy: examples documentationNedim Hadzic2014-01-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Added documentation for lowenergyscanner example together with two screenshots. Change-Id: I3615ffee26edd5b2ce75e93adc940ba9d272f072 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Implemented Bluetooth Low Energy: documentationNedim Hadzic2013-12-051-1/+104
| | | | | | | | | | | | | | | | | | | | | Documentation related to implemented BLE API added in the overview section. Change-Id: I4261f89b80a260140a844d535b881fe82bc6b873 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Implemented the characteristic error handling.Nedim Hadzic2013-11-288-25/+82
| | | | | | | | | | | | | | | | | | | | | In case of enabling notifications and writing values to the LE device, some errors can occur and which are reported now. Change-Id: I02c6deab925d06916c5b56705c9423386400f713 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Removed get part in return methods.Nedim Hadzic2013-11-286-20/+22
| | | | | | | | | | | | | | | | | | | | | In case method name is getValue(), it was renamed to value(). Change-Id: I914e16bd0b630c0810932c52af14f091cc35bd8f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | QNX complie error solved.Nedim Hadzic2013-11-202-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Random address variable moved from Bluez to both platforms. Added friend class in QLowEnergyCharacteristicInfo. This was done because on QNX platform it was unable to compile. Change-Id: I3fc90a05fe8fb6ee2337bd8fab0e1aa2249cd001 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Additional constructors to QLowEnergyDescriptorInfo class and method ↵Nedim Hadzic2013-11-1116-60/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0439-96/+4427
|/ / | | | | | | | | | | | | | | | | 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-2262-609/+784
|\| | | | | | | Change-Id: I47daf8e94c809bd2786ad27cc56367da839504a0
| * Doc: Fix module name formatv5.2.0-beta1Sze Howe Koh2013-10-213-3/+3
| | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Task-number: QTBUG-33360 Change-Id: I51f23e4b3ac0dffe8fef674f2cb431776d5829ab Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Remove not needed error enum and avoid future enum value collisionsAlex Blasche2013-10-153-7/+5
| | | | | | | | | | | | Change-Id: Ieb40958b689914db3b9b5303757426d7348d3fbe Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Update Bluetooth QML meta data for Qt CreatorAlex Blasche2013-10-151-7/+16
| | | | | | | | | | | | Change-Id: I50ae4f34e1d737c59ff0e15e940e0e6484412271 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Doc: language and style review doc qtconnectivityNico Vertriest2013-10-149-25/+28
| | | | | | | | | | | | | | | | Reviewed doc Bluetooth and NFC Task-number: QTBUG-32173 Change-Id: I80f81c2123c3ee4fc269f471123f332dc39ee958 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Use recommended way of using \brief statements in QML Types.Alex Blasche2013-10-148-8/+8
| | | | | | | | | | | | Change-Id: Id8f57b69dcb80056b53bfee538a2f65c9662bb55 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * Update Nfc QML meta data for Qt CreatorAlex Blasche2013-10-141-25/+33
| | | | | | | | | | | | Change-Id: Ibb2651b948bf39e9a56a5351d5c69d5848c7a7bd Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 00:14:30 +0000