summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0817-3/+3
|\ | | | | | | Change-Id: I77d7b5877ce36057c3882a0b397ff27d5c35ad53
| * OSXBTCentralManager - fix details discovery (iOS/OS X)Timur Pocheptsov2016-04-041-1/+1
| | | | | | | | | | | | | | | | | | -serviceForUUID: fails to find included service and returns a nil for a valid service previously discovered. Task-number: QTBUG-52324 Change-Id: I9f4f8b1f3d3a78879344ace0170e23c03921d648 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Spelling fixFrank Meerkoetter2016-03-231-2/+2
| | | | | | | | | | Change-Id: I4bcaa2d27d0ac4c9d3ed5fc3800392ba73e77a89 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-2212-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I621cb2437578c3f8a658e7c26a4de045825147ce Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-223-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I2b8810829f1b91033539229a6d4b3e505b8730ea Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Remove simulator support for NFCRainer Keller2016-04-057-776/+0
| | | | | | | | | | | | | | Support was dropped from the Emulator in 2012. Change-Id: I8cf75c368f1197a49bdc242c13408d0a2e6eda3d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-2117-31/+33
|\| | | | | | | | | | | | | Conflicts: src/bluetooth/qlowenergycontroller.h Change-Id: I15571e47fbf06545d46d1b9a9b2b47bf815ae293
| * Nfc - guarantee statics initialization orderTimur Pocheptsov2016-03-181-3/+6
| | | | | | | | | | | | | | | | | | Use Q_GLOBAL_STATIC instead of simple static QMap object to avoid problems with undefined initialization order for 'statics' from different translation units. Task-number: QTBUG-51860 Change-Id: I6ce48f3c0770dc0ff125b443816f6b3b23ae809e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Add explicit and make public headers compile with ↵Marc Mutz2016-03-1516-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: I375361699615d0fc874e0b96a84543e233eff5f0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Android: Use default API version (16)BogDan Vatra2016-03-171-1/+0
| | | | | | | | | | Change-Id: I4d125bbe7f18cb77dffc3747f33bba2b63b1a87d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Fix QLEServiceData comparison operator inconsistencyAlex Blasche2016-03-093-4/+18
| | | | | | | | | | | | | | | | The comparison operators usually have const& parameters. Change-Id: Ibd8e7d1fe5704b4de3a0bfabe1bbc991411eecba Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-072-11/+11
|\| | | | | | | | | | | | | Conflicts: src/bluetooth/bluetooth.pro Change-Id: Ied68947463e7eba418386a99903131d2cbdd458b
| * don't over-expose private dependenciesOswald Buddenhagen2016-02-252-7/+7
| | | | | | | | | | Change-Id: Ida2256e88c7ebe698f8b4734afc504dcef2da2d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-252-4/+3
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I3cdb59c65dbbf2b536ee927dd912349b4ceca335 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | BLE: Write the whole 31 bytes of advertising data to the controller.v5.7.0-alpha1Christian Kandeler2016-03-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | The specification says: "Only the significant part of the Advertising Data is transmitted in the advertising packets". This seems to refer to the data that is actually sent by the hardware and not to the data used in the HCI command, as our original implementation assumed. At least there seem to be controllers who won't accept such "short" packets. Change-Id: I732cfc1e05fc135fd336d832e725d969c98b60cf Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Bluetooth LE: Fix bogus warning output.Christian Kandeler2016-02-251-4/+5
| | | | | | | | | | Change-Id: I9800e80b455c14f0e6086b1d9e21e2b26a385ebe Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Bluetooth Advertising: Inform clients we want an LE connection.Christian Kandeler2016-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | When given the choice, devices will try to establish the GATT connection over BR/EDR, which we don't offer. It also makes little sense, considering we advertise over an LE mechanism only. This patch makes connections from e.g. Android and iPhone work. Change-Id: I7a224ab20a50c1c6ead698ea864b1ec13bca3851 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Bluetooth LE: Fix crash introduced by latest merge.Christian Kandeler2016-02-231-0/+1
| | | | | | | | | | Change-Id: Id854c4c412555722bbc01783c0768586eb3ea4ec Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Bluetooth LE: Give rationale for API design regarding included services.Christian Kandeler2016-02-232-1/+4
| | | | | | | | | | | | Task-number: QTBUG-51152 Change-Id: I5e4eee324f0008291be734db7a9d984071ca57c9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Disable simulator build.Christian Kandeler2016-02-231-1/+1
| | | | | | | | | | | | | | | | | | It has obviously never been compiled with Qt 5. The code includes headers that have long been removed, uses classes that don't exist at all and so on. There is no trivial fix. Change-Id: I8fb41a50d41b061a7d7cc3c96e372f170eeb88d3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Bluetooth LE: Fix typo in advertising code.Christian Kandeler2016-02-171-1/+1
| | | | | | | | | | Change-Id: Ia8a0287e2e963e1a6353de4eb2aaa165549d6a8b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Bluetooth LE: Add support for Signed Write command in the central role.Christian Kandeler2016-02-1717-115/+212
| | | | | | | | | | | | Task-number: QTBUG-41175 Change-Id: I62d74236faf9161681306d952e409e23e0cea24d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 16:28:03 +0000