summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-1616-273/+178
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/bluetooth/qlowenergycontroller_bluez.cpp Change-Id: I00f45a2a22a045e7836f2caeb76cc5599ced6279
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-153-267/+91
| |\ | | | | | | | | | Change-Id: Iabf0939a5f23c5da85de3a73545cd8abdc9a3e65
| | * Update qml types for QtConnectivity 5.6.0 releasev5.6.0-rc1v5.6.0Alex Blasche2016-02-052-267/+2
| | | | | | | | | | | | | | | Change-Id: Iadd9905f4129ede5f0c06b1e1a88a8f932c37c70 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| | * Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-021-1/+8
| | |\ | | | | | | | | | | | | Change-Id: I25358eae40c07d8e5ba1224b3508c5fee95d3a85
| | * | Add changelog for QtBluetooth/QtNfc 5.6.0 releaseAlex Blasche2016-01-261-0/+89
| | | | | | | | | | | | | | | | | | | | Change-Id: I1422ab23ef1abd812eb5523105cbadc8ef1aa015 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * | | Update gitnignore following recent changes in the build systemAlex Blasche2016-02-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build system generates wrapper scripts for direct host tool calls. This scripts should not be tracked by git. Change-Id: I9b2c9521c2c12e38f32ae69621d72e18eb33945b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| * | | Bump versionOswald Buddenhagen2016-02-081-1/+1
| | |/ | |/| | | | | | | Change-Id: Ie993ef22029b1d05f39e4edc8f859841790ca6a6
| * | Not all descriptors where discovered in some casesOleksii Serdiuk2016-02-021-1/+8
| |/ | | | | | | | | | | | | | | | | | | | | While discovering descriptors, when handles are not numbered sequentially, the discovery stopped as soon as "no attribute in given range found" error is received. However, there could be more characteristics pending. As a result, descriptors for those characteristics where never discovered. Change-Id: Iad9d7203020b0787f1d4571fc7063ef390448ce9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Bluetooth: Do not assert on remote data.Christian Kandeler2016-01-221-1/+6
| | | | | | | | | | | | | | Otherwise, a malicious device could crash our application. Change-Id: I427eb1ff88b08710d5c74230f5877b0c59b6fb0f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Document QtBluetooth and QtNfc logging categoriesAlex Blasche2016-01-152-0/+40
| | | | | | | | | | Change-Id: Ib5a9f4e5c0eef85a1acd93454d842bbb0d615751 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * Fix qdoc warning about missing dtor documentation in QQmlNdefRecordAlex Blasche2016-01-151-0/+3
| | | | | | | | | | Change-Id: Ic1f3ca5075174addfbc6d76f31d9b89d2c654d19 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * Bluetooth: Fix mapping of device address to HCI id.Christian Kandeler2016-01-151-1/+1
| | | | | | | | | | | | | | | | The previous code always returned the id of the first device in the list. Change-Id: I6f3cde2405d53eab009d7409d9e3c6b47d97e53b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Bluetooth LE: Fix premature initialization of HCI manager.Christian Kandeler2016-01-155-4/+20
| | | | | | | | | | | | | | | | The private class used a member in its constructor that was only set afterwards. Change-Id: I19b7ca2a5048771a447d63a56ad10ad56c311e91 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix typo regarding requiresAndy Shaw2016-01-081-1/+1
| | | | | | | | | | Change-Id: I59c6344b1c1ab0c892d8c66a7348f8321e3a603e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Android: Fix QBluetoothSocket::bytesAvailable()Alex Blasche2016-01-072-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-50345 Change-Id: I721b98f9b6ccff2a987a6c477d08902332ce848c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Bump QML types to version 5.7Alex Blasche2016-02-124-7/+7
| | | | | | | | | | | | Change-Id: I4d93ed117fab0047a9d6c90bb3eaa3755c0fa523 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix undefined behavior in AddressInfo's default ctor.Alex Blasche2016-02-113-3/+16
| | | | | | | | | | | | | | The AddressInfo::type member was not properly initialised. Change-Id: I79c8e1d00d4cb03e3d073a23bb4dbf6b9d510b7c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Improve BTLE documentationAlex Blasche2016-02-103-7/+30
| | | | | | | | | | | | | | Fixes a few qdoc warnings and improves the available content. Change-Id: I286cfdeb85d3be2d100e00150efedf7645096f69 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Bluetooth LE: Fix two list setter functions.Christian Kandeler2016-02-093-0/+10
| | | | | | | | | | | | | | | | Adding the new list elements is all well and nice, but we have to clear the existing ones first. Change-Id: I1b044f2ea86a4a300bde93535a944c18328aa805 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Bluetooth LE: Add configure test for Linux crypto API.Christian Kandeler2016-02-094-2/+50
| | | | | | | | | | | | | | These files were forgotten in commit c516f6157a. Change-Id: I87bd57545b8873fc0aa00751058be604588daffe Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix warnings in LeCmacVerifierAlex Blasche2016-02-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | lecmacverifier.cpp:99:6: warning: unused parameter ‘message’ [-Wunused-parameter] bool LeCmacVerifier::verify(const QByteArray &message, const quint128 &csrk, ^ lecmacverifier.cpp:99:6: warning: unused parameter ‘csrk’ [-Wunused-parameter] lecmacverifier.cpp:99:6: warning: unused parameter ‘expectedMac’ [-Wunused-parameter] Change-Id: I3ae882ebbc967d6694151e90d7463c88a05a8529 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Doc: fix minor typoGabriel Pannwitz2016-02-041-1/+1
| | | | | | | | | | Change-Id: I7d4546b31b966a0ac2ac82379a55eefc0f966b19 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Bluetooth LE: Add support for Signed Write command.Christian Kandeler2016-02-0313-31/+562
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This is how we get at the signature resolving key: 1) On connection from a client, we read the key from the respective BlueZ settings file (BlueZ 5 only, as I did not manage to find out where BlueZ 4 keeps this information). 2) Also monitor the HCI traffic for key updates (due to re-pairing). - While there is an autotest for the actual hashing procedure, the overall feature cannot be easily tested for various reasons (there is no signed write support in our client API, for one). However, to help with manual testing, the server part of our autotest now exposes a characteristic that supports signed writes. - This feature requires a Linux kernel >= 3.7. Change-Id: I7ede9b430de167fe1f4519eedf8670d88d79aa25 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Docs: Update Bluetooth LE overview to include peripheral functionality.Christian Kandeler2016-01-271-8/+25
| | | | | | | | | | Change-Id: I7e58d282d4b0352dfb5b5f2775e29c3abda95f74 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge BTLE Peripheral support on Linux into 5.7/devAlex Blasche2016-01-2749-179/+6000
|\ \ | | | | | | | | | | | | | | | Source branch is gerrit/neard. Change-Id: Ifbefad5ec236964740b93e2ef5c0213997adde44
| * | Update to new Qt license headersneardAlex Blasche2016-01-2616-244/+318
| | | | | | | | | | | | | | | Change-Id: I2c799dbac99c66d5e87fd92efc215e121064cfde Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * | Merge remote-tracking branch 'gerrit/dev' into neardAlex Blasche2016-01-26289-4082/+7369
| |\ \ | |/ / |/| | | | | Change-Id: If9cf6718cbd619dd7ce38db2da274fe9d0a41fb7
* | | Updated license headersAntti Kokko2016-01-20257-3587/+6289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I856c13e2a6d4d12c46e1286b0ca1c092ee4608f8 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Updated license headersAntti Kokko2016-01-2030-495/+1054
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I37338c968d8cb5a056cd42e1130cfa077b12d164 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Enable using the module in a statically built applicationAndy Shaw2016-01-114-0/+26
| | | | | | | | | | | | | | | | | | Change-Id: Ib3e11b80d0287bb0421d399d01b92c6367b52a1e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Add example for Bluetooth Peripheral functionality.Christian Kandeler2016-01-266-2/+254
| | | | | | | | | | | | | | | Change-Id: I1b48bc0be6265fb033fa2c14c2b7a182966fe2a2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Bluetooth: Print warning to indicate that signed write is unimplemented.Christian Kandeler2016-01-261-0/+1
| | | | | | | | | | | | | | | Change-Id: I93e9bd7fb3cf7d683907cd4ad6bc5f4781af91ae Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Bluetooth: Add more thorough checks for the Signed Write Command.Christian Kandeler2016-01-251-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now take the following rules from the specification into account: - Signed writes are only possible if the two devices are bonded. - Signed writes are not allowed if the link is encrypted. - If the link is encrypted, a normal (unsigned) write command can be used to write an attribute even if it is specified that a signed write is required. That is because the encryption provides the same level of trust as the signature. Change-Id: I15d6db10f9b039aeda026e57b0378aef2b88e73a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Bluetooth: Fix typo in command value.Christian Kandeler2016-01-221-2/+2
| | | | | | | | | | | | | | | Change-Id: Ieb903989c5ef5de924c9c4a0d31c4ef9a74e2c40 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Bluetooth LE: Fix check for space left in advertising data.Christian Kandeler2016-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | The value we compare against can be smaller than zero. Change-Id: Iea67ea3439d966ff24f93e63870a3b487f4c4644 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Bluetooth LE Advertiser: Add missing endianness conversion.Christian Kandeler2016-01-181-2/+2
| | | | | | | | | | | | | | | Change-Id: Ie10a247eddf298cb09edc53c75d414d3b0891a96 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Bluetooth LE: Add connection update functionality.Christian Kandeler2016-01-1815-0/+555
| | | | | | | | | | | | | | | | | | | | | Implemented for BlueZ only. Change-Id: I358a98bbc7499d5ce5437fb0d4672fde46c3b831 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Add the "We mean it" statement to private headerAlex Blasche2016-01-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | There are more private headers with the statement but they are auto generated using qdbusxml2cpp and should match whatever was generated. Change-Id: I863f3703fc01fdd827dd9ccc480179880ae0d193 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * | Merge remote-tracking branch 'gerrit/dev' into neardAlex Blasche2016-01-0514-34/+52
| |\ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: src/bluetooth/qlowenergycontroller.cpp Change-Id: I28b116deb3fa87169432eb2d94b70894359a9057
* | | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2016-01-0512-25/+44
|\ \ \ | | |/ | |/| | | | Change-Id: I97b51eb3fe2040711c00da67bbb1954fc2e65c1f
| * | Remove yet another implementation of AutoreleasePool's RAIITimur Pocheptsov2016-01-051-2/+1
| | | | | | | | | | | | | | | | | | | | | Now we have this class in QtCore, no need in my "home-made" version anymore. Change-Id: Id26944dd6970cc2a8ac9d02675f8af9adecc3d44 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Bluez5: Sanitize app name to be valid DBus object path nameAlex Blasche2015-12-234-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | This may happen when the app name contains for example a dash ('-'). Task-number: QTBUG-49402 Change-Id: I04b289b0723e2979a67c93e335205556bf1eb30e Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| * | Handle undefined QLowEnergyController error cases as Unknown errorAlex Blasche2015-12-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is important on Android as not all error conditions are exposed via QLowEnergyController::Error enum. Change-Id: I442ecffcadc01e1a2b60ae17dc6e63e08e5f4149 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Fix inconsistent use of 'override'.Erik Verbruggen2015-12-231-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I3addd4258e3bbb5aaa6eca21af338aab57b9cf33 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| * | Remove deprecated 'register' storage class specifier.Erik Verbruggen2015-12-231-1/+1
| | | | | | | | | | | | | | | Change-Id: Iec9163b25f961a5f7371150aba17a892e5fac305 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Android: Invalidate services after a disconnect from the peripheral sideAlex Blasche2015-12-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far, invalidation only took place when the local/central side disconnected the connection. Task-number: QTBUG-50125 Change-Id: Ic01725d1b83e49ad7df6971d980b480f839d550b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Remove unused isConnecting member variable in QLECPrivateOSXAlex Blasche2015-12-232-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Most likely it was used before some changes rendered it unused. At this point the variable was initialized to false and never ever set to true. Change-Id: I5b60cf83bc362ff53f8ce276c16392aada9efc69 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| * | OSX/iOS: Invalide QTLE services when remote device disconnectsAlex Blasche2015-12-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | So far, only a local disconnect triggered the invalidation process. Task-number: QTBUG-50125 Change-Id: I324e01c86eb0c7cc820e91a6f6d6d01fb23170ab Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| * | Fix namespaced build on OSX.Erik Verbruggen2015-12-231-2/+2
| | | | | | | | | | | | | | | Change-Id: I0baa4bbbc5d398f388a1e0aff9ba88f82a23c1cc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | tvOS supportMike Krus2016-01-053-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Builds but not tested Moved Q_DECLARE_METATYPE outside of namespace to fix namespaced builds Change-Id: I19c1dba904da8fad155f0f612b863e8f5e0c422e Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 12:55:21 +0000