summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.10.1' into 5.11" into ↵v5.11.0-alpha1Liang Qi2018-02-141-0/+39
|\ | | | | | | refs/staging/5.11
| * Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-141-0/+39
| |\ | | | | | | | | | Change-Id: I85c72a78661820786ee2f5bedd60361f66212e0e
| | * Add changes file for Qt 5.10.1v5.10.1Alex Blasche2018-02-061-0/+39
| | | | | | | | | | | | | | | Change-Id: Iade3422ae5acf099eb0b79e857e4c73d60651d37 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Fix typosJarek Kobus2018-02-142-2/+2
|/ / | | | | | | | | Change-Id: I0a35d5584c2c4364c6987d9add5e66f996647403 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-1219-157/+140
|\| | | | | | | Change-Id: I56f791fcfdbc60562c6a10b163f721da3a9d4386
| * Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-02-023-8/+23
| |\ | | | | | | | | | Change-Id: Ia3172f663412eb9df0b1c41fc114699813039c43
| | * Windows: Cancel and close the operation before deleting the SocketWorkerAndy Shaw2018-01-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it is possible that after calling Cancel() on the IAsyncInfo that it will still call the Completed() callback, we need to ensure that it has a chance to process the pending events before it is deleted. Change-Id: I7d6fbb5bf6344098048b147c9d361c1fe7923b55 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * Initialize the discoveryAgent variable to 0Andy Shaw2018-01-242-0/+2
| | | | | | | | | | | | | | | Change-Id: Ief783e899cde02ae033be8cd3af61ab5572d81a5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * winrt: Finish classic BT device discovery if no device is foundOliver Wolff2018-01-191-8/+17
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65801 Change-Id: I32be0262165d963ba5fb933c73414451431b2242 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Revamp Qt NFC examples: poster exampleAndrew O'Doherty2018-02-012-40/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Align QtNfc Module examples to QML and c++ coding conventions. This commit is focused on the poster example. Task-number: QTBUG-60644 Change-Id: Icd0990c24d2d0e79a67a1354d82a9f6c1bf59244 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Revamp Qt NFC examples: ndefeditor exampleAndrew O'Doherty2018-02-017-42/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Align QtNfc Module examples to QML and c++ coding conventions. This commit is focused on the ndefeditor example. Task-number: QTBUG-60644 Change-Id: I6c14e1a7965bb335bfea87ed80c442926b6a36a4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Revamp Qt NFC examples: corkboard exampleAndrew O'Doherty2018-02-012-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Align QtNfc Module examples to QML and c++ coding conventions. This commit is focused on the corkboard example. Task-number: QTBUG-60644 Change-Id: I545cbffb6841b14e344ce1763e2387e2d5daa927 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Revamp Qt NFC examples: annotatedurl exampleAndrew O'Doherty2018-02-015-38/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | Align QtNfc Module examples to QML and c++ coding conventions. This commit is focused on the annotatedurl example. Task-number: QTBUG-60644 Change-Id: Ia8e847fe270a677812a75827945a1e85d6c1d1a9 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Windows: Do not assert due to insufficient accessAndy Shaw2018-01-251-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the device does not give access to obtain the list of services, then it should not throw an assert as the connection still succeeded, but the device cannot be used. Change-Id: I650eaba085f30c3cdc9980dd53de63482c7e7531 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Improve robustness of tst_lowenergycontroller testAlex Blasche2018-01-251-15/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test checks the value of various descriptors and characteristics of the TI Sensortag. One of those values are ClientCharacteristicConfiguration descriptors. This type of descriptor is consistent across multiple session for the same connecting central device. Therefore it may change and would create frequent test failures. Even worse, the unit test itself toggles the CCC value and assuming that a test may fail, the CC may remain with an uncertain value. This change makes the CCC value test more generic as it checks that the found value is within the acceptable range w/o expecting a defined value. Change-Id: I004a1037ee9e602807e4df5511c7d2205c92e5fe Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | Make tst_lowenergycontroller pass on DBUS Bluez backendAlex Blasche2018-01-253-23/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition the patch adds a few improvements making the tests somewhat more reliable. 1.) The 0x1800 BTLE Generic Access service is not exposed by BlueZ's API. That's a deliberate decision by the devs. The patch removes the service from the list of to-be-checked services. 2.) QTBUG-42519 is a limitation of the non-DBus BTLE implementation and cannot be fixed. The new DBus API does permit concurrent QLowEnergyController instances. However the instances share a platform wide singleton which means that if one instance is connected then the other instances connects as well. Other platforms separate the connectivity between instances. Therefore tst_concurrentDiscovery() has to offer three different behavior patterns 3.) Consecutive calls to writeDescriptor() in tst_readWriteDescriptor() cause a crash of bluetoothd (version 5.47 or below) and a premature disconnect from the BLE device in version BlueZ 5.48. To avoid the problem qWait calls were introduced to delay the time between individual calls. 4.) Improves the robustness of the tst_writeCharacteristicNoResponse() test which relied on notifications being enabled for two of its characteristics. So far the notifications for one characteristic were enabled but not for the other. For some magical reason this happened to be the case on all platforms but the new DBUS BTLE implementation. 5.) Swapped out some QVERIFY statements in favor of QCOMPARE. This provides better error visibility when a test fails. 6.) The patch adds a time limitation of BTLE discovery which reduces the time the entire test run takes. This is API that was recently added. Change-Id: Ib633a87614af9cbccdb0253ba47fd059a2013358 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | BlueZ: Implements characteristicChanged() notificationsAlex Blasche2018-01-252-9/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature depends on ClientCharacteristicConfiguration descriptor types which determine whether changed signals are sent or not. The patch also ensures that cached char values are not updated/cached when the char is not readable. Task-number: QTBUG-46819 Change-Id: I841bcaaca60c588eae7d4067b6ead6af28f957e3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Implement read-/writeDescriptor() for DBus GATTAlex Blasche2018-01-252-12/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | In addition there is a minor debug cleanup in the reading of descriptor code. Task-number: QTBUG-46819 Change-Id: I3f65c7d113b306b5b4892fa5df189476c06df0e9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Implement Char read & write for dbus GattAlex Blasche2018-01-252-8/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | Read/write is limited to central role support. Peripheral role support will follow at a later stage. Task-number: QTBUG-46819 Change-Id: Idc27ea31cf0629470dc46490235c57f64b51498d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Avoid wrong implicit cast leading to wrong connectToService() callAlex Blasche2018-01-253-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change passing a QBluetoothUuid::ServiceClassUuid to connectToService() caused the port overload to be called rather than the QBluetoothUuid version. This patch introduces a ServiceClassUuid overload that avoids relying on implicit type conversion. There is a remote chance that this patch breaks existing code if the remote port was in the same range as the ServiceClassUuid range. In general the Bluetooth ports are below 100 though. Task-number: QTBUG-65831 Change-Id: I6574291ae6fee284466d84ecb91f21e3be89f6b2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-2026-27/+10003
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6e93fc7435a49b601a5c10519ed86d2a15125074
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-187-12/+65
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6d2140aa8692bc7ce56f4366275fd02d008900f0
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Qt Forward Merge Bot2018-01-171-0/+31
| | |\ | | | | | | | | | | | | Change-Id: Iff97db0023af3d450c5d8445101e56e360425279
| | | * Add changes file for Qt 5.9.4v5.9.4Alex Blasche2018-01-111-0/+31
| | | | | | | | | | | | | | | | | | | | Change-Id: I20e1659b47f11733907f836782ac1a717891b35a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * | Disable compiler flag using proper qmake comment styleAlex Blasche2018-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I041606473b333500da29c821d7dc089313856f65 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * | BlueZ: Fix inconsistent QLEService error stateAlex Blasche2018-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emitting just the signal does not change the error state. setError() ensures that the error state/member and the error signal are emitted. Change-Id: Idc044b8b97d4025b0f3a4d172c11c6b3a4e81ecb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * | QtBluetooth: Fix heartrate-game for QT_PLATFORM_UIKITTimur Pocheptsov2018-01-041-1/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QBluetoothLocalDevice::isValid() returns false for iOS/tvOS/watchOS (because Apple does not provide any public API/Framework to implement QBluetoothLocalDevice correctly). Make ConnectionHandler::alive return true for QT_PLATFORM_UIKIT. Task-number: QTBUG-65547 Change-Id: I219fbeadc752b815f8369d332c10a24e70150abb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * winrt: Do not crash when trying to an unreachable paired LE deviceOliver Wolff2017-12-121-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As device discovery returns every paired device on winrt, it is possible that we try to connect to a device, that is paired but not available. When doing so the application should not crash but state that there was an error connecting to the device. Task-number: QTBUG-64480 Change-Id: I8d79f6da1de2b0bda7a51a7cfd068bb4a6057257 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * winrt: Add bluetooth capabilities for msvc2017 as wellOliver Wolff2017-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As msvc2013 was dropped we can add the capabilities independent of the msvc version for winrt. Change-Id: I14aea0da9226a5de6ffa2cf7c69a4ae5a69e8256 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: Ia5c39a0db946a649c1992e32d8b05dc455f4283f
| | * Merge "Merge remote-tracking branch 'origin/5.9.3' into 5.9" into ↵Liang Qi2017-11-231-0/+37
| | |\ | | | | | | | | | | | | refs/staging/5.9
| | | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+37
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ied8b3c37d07d1bac43a95d7a13e3b8d1644d8b8e
| | * | | BlueZ: Prevent hanging of QLEController job queue due to comm timeoutAlex Blasche2017-11-231-3/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an ATT READ_REQUEST times out the ATT stack stops spinning the event queue. This is particularly bad during the initial service discovery when a lot of read requests are scheduled in one go. The consequence was that the QLEService instance was stuck in the ServiceDiscovering state. Subsequently the service object is unusable. The patch ensures that the ATT event loop continues after the timeout happens. If multiple char or descriptor reads (on the same service) have this problem the service discovery can still take a very long time. The user can adjust this via the BLUETOOTH_GATT_TIMEOUT env variable. [ChangeLog][Platform Specific Behavior][BlueZ] Fixed hanging service discovery state when remote device does not respond to ATT read requests. Task-number: QTBUG-64669 Change-Id: I8d22c13b825a921b140213b8b67e59e2310c362c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Example heartrate-server needs only core and bluetooth modulePeter Seiderer2017-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes compile with disabled gui module. Task-number: QTBUG-64597 Change-Id: I376dede3db987e524f97070344cc119e0ee1d187 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | winrt: Early return instead of assert is case of errorMaurice Kalinowski2017-11-161-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices report access denied for various reasons (group policy, disabled, etc.). Hence, do return and stop the discovery instead of asserting. Change-Id: I22fe9cc375fd3b3580deaf72c614bf62600cbf32 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | qtlite: Skip building examples when configured with no-feature-itemviewsRainer Keller2018-01-124-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53141 Change-Id: Id256f00349d8bee8e4176005eea3bcba595899a2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Improve documentation about missing iOS support in QtBluetoothAlex Blasche2018-01-045-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65547 Change-Id: I472b354621db89a921eec01b1459d46dbaa15ac0 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | | Expect failure for cmac tests on qemu testsSami Nurmenniemi2018-01-032-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qemu-user can't hande socket option SOL_ALG, this change detects that situation for boot2qt targets and expects failure. Task-number: QTBUG-63152 Change-Id: I4ac0c9b619caa789daf71c1567332749e5bbcd1e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I6fba22db3302d3a847ce913d21ad2eafdf9c5280
| * | | Update QML versions for QtBluetooth and QtNfc in step with Qt versionAlex Blasche2017-12-154-15/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I00ac4bbb56bd809784f94812221130365f06218d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | | Add binary compatibility files for QtConnectivity for 5.10Milla Pohjanheimo2017-12-132-0/+9742
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility files added for 5.10.0 Change-Id: I027491568fb9fa8017a0bc234027522b41f755c2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+115
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ie2573a8dcc9f04baf3a2c620dfc6bb35d18789c6
| | * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+37
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: I1de27b73812240b2f7a7e99f914822e387e35aef
| | | * | Add changes file for Qt 5.9.3v5.9.3Alex Blasche2017-11-081-0/+37
| | | |/ | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64191 Change-Id: I37f68aa25b828a90c4efaead2a2e1bc80e270182 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-202-1/+30
| | |\ \ | | |/ / | |/| | | | | | Change-Id: I431587c5e473280a6e53c12116b3b62aea34d829
| | * | Add changes file for Qt 5.10.0Alex Blasche2017-11-201-0/+78
| | | | | | | | | | | | | | | | | | | | Change-Id: I3015244ee9cbbd8e68b48051b6319a4aef7f84c7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | Implement QLEService::discoverDetails for DBus BluezAlex Blasche2018-01-054-7/+405
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes support for reading of characteristics and descriptors. Task-number: QTBUG-46819 Change-Id: I8ac1ef3bcd5bc475941f1a9f889d0742eb8def35 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | Support service discovery for BlueZ DBus backendAlex Blasche2018-01-052-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the same time a typo in a comment is fixed. Task-number: QTBUG-46819 Change-Id: Ic017df4d2d52cf0d226b6e083a9ec5f28657dee0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | BTLE DBus: Add ability to connect/disconnect to remote deviceAlex Blasche2018-01-052-4/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch uses the Device1 DBus API to connect and disconnect to a remote BTLE device. In addition, status and error condition tracking is added to adapt to various error cases. Task-number: QTBUG-46819 Change-Id: I0671df5596882c89aeead89c05ddcc855f8ba375 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | Implement bluetoothd version testAlex Blasche2017-12-136-10/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the ability to detect the underlying version of bluetoothd. The bluetoothd version provides the means to decide whether the DBUS LE API is sufficient to fullfil the QLEController requirements. Bluez DBus LE API is usable since Bluez 5.42. Prior versions only had experimental DBus LE APIs. Task-number: QTBUG-46819 Change-Id: Ic047fba27c01ee40571abb0c4eb45828f4a64475 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 17:05:52 +0000