summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+36
|\ | | | | | | Change-Id: I636a838d6b38996e2133536cbe523c3bfebf6d96
| * Add changes file for Qt 5.13.2v5.13.2Antti Kokko2019-10-221-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | + 406b18fdb3704a9e9e66cefbc74e7cff55f1947c Fix QLEAdvertisingData::setManufacturerData on Android + 0a5bf7a41e5c2c4a36efeace83444ceaee79c945 Add changes file for Qt 5.12.5 and fix 5.12.4 change file + dd4593c61e4b77c4e3b1ee516a1e8825ebb0197b Fix build errors with clang-cl on Windows + d3ace86011d4e34eeafa795270ac027afd54f857 Doc: Replace WinRT with UWP in Qt Bluetooth module docs + 7390de230e3c86049824bef756e4af623a547d61 Add descriptor even if the read fails during service discovery Change-Id: Ief5198d3c8c927226c59fdb2b8f44dac1f428b20 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | Change-Id: I28a758b2323407cb86bd86ec3f70214a8220d779
* | Fix classic device discovery on AndroidAlex Blasche2019-10-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems recent Android releases (at least confirmed for Android 9) require location permission for classic device discovery. Previously, it was only required for BTLE discovery. This patch ensures the permission check is done for every type of device discovery on Android. Task-number: QTBUG-69615 Change-Id: I9596c083ecfd9b5e861c1aa5e9900bab5f44237f Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | qbluetoothdevicediscoveryagent_winrt: Decrement device count in case of failureOliver Wolff2019-10-111-4/+10
|/ | | | | | | | | | It is possible that obtaining a paired device inside the callback fails, if the device was paired to another than the currently active bluetooth adapter. If we do not decrement the to be detected device count, the scan will never finish. Change-Id: I86140d082891482c759f33888b2483f3f5821253 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add descriptor even if the read fails during service discoveryAlex Blasche2019-09-271-2/+9
| | | | | | | | | | | | | | | | | | | | leDescriptorRead() serves two pruposes. Firstly, it informs Qt of the value/result of the read operation. During service discovery it is also used to inform Qt that a descriptor was found. This info is used to build up the internal data structure representing the service, its characteristics and its descriptors. If we have a non-readable descriptor the read failed (as expected) and Qt was never informed about the existence of the descriptor. During service discovery the primary purpose is to inform about the existence of a descriptor though. This patch ensures the notification comes through and we accept the fact that the passed value is not known. Fixes: QTBUG-78201 Change-Id: Id73a27c90905cb769f1cd168b48299d580587594 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Doc: Replace WinRT with UWP in Qt Bluetooth module docsLeena Miettinen2019-09-231-5/+6
| | | | | | | | Task-number: QTBUG-61884 Change-Id: Idd8e3287f06f3f30102ae8e644dadec1eb8769f4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-082-1/+39
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-082-1/+39
|/| | | | | | | Change-Id: I5fe797d411844a2b3338e6700b0ae2887080550f
| * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-082-1/+39
| |\
| | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-072-1/+39
| |/| | | | | | | | | | Change-Id: I6d8c7763728702c3133ecf4c15fbfa7657eb5b21
| | * Add changes file for Qt 5.12.5 and fix 5.12.4 change filev5.12.5Alex Blasche2019-08-272-1/+39
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | + 3394807b3b0a234452b76e6295cb2362dc2c0cc0 Bump version + 0fc7e18bf7a24c9408602242d51a852905dfd0da Core/IO/Bluetooth - fix ambiguous conversions + 8a6d9c307851f3492ddc597f5f03e80f236a7857 Fix compilation with C++20 + 4ac755bb6e51891881b7477702be8ca917b60c8a winrt: Do not try to delete nullptr worker + 263fc5186325a7dd59a7533b98b3bf1296ea0d16 Do not handle PAIRING_VARIANT_PIN + 8110fdd4c6d80d05934768fa808a4cb187212fe0 Core/IO/Bluetooth - fix ambiguous conversions for macOS + c9d585da2ddd49108d7b56f480bcfc9d71b67dbf winrt: Add limitations to bluetooth overview page + 406b18fdb3704a9e9e66cefbc74e7cff55f1947c Fix QLEAdvertisingData::setManufacturerData on Android Change-Id: Ib8bf9529e85e8f8c2f76c203120afb3d9ceca492 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Fix build errors with clang-cl on WindowsMårten Nordheim2019-09-053-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The following errors are fixed: error: member access into incomplete type 'ABI::Windows::Devices::Bluetooth::IBluetoothDeviceStatics' error: unknown type name 'QMutex'; did you mean 'Mutex'? Task-number: QTQAINFRA-2139 Change-Id: I5e5d9c0776cd9feb5d682c5a0e1be2f5173101f9 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+36
|\ \
| * | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+36
|/| | | | | | | | | | | Change-Id: I5d7c0be7443fd951c770f49b6690870c54cdd376
| * | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-08-061-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 672ebe7690455c6ee13f96ad05d030183a7e57f8 qbluetoothsocket_winrt: Use recommended service connection approach if possible + b5ec1e15f360cd60386488588dd4796169082355 winrt: Make sure that ProtocolDescriptorList is always set for services + 576164fef388f312dcc7f59721de8237dfcd15b3 Create qbluetoothlocaldevice_winrt + 23386ed8dab0a8b8280c2e1b935171adcce0d833 winrt: Add QBluetoothLocalDevice::pairingStatus + 5aa37aab69d89691ab7eded7f708915612f1afa3 qlowenergycontroller_winrt_new: Add registerStatusChanges and onStatusChange functions + 68cb332228df1c8730e721061134c18bda37cf02 qlowenergycontroller_winrt_new: Avoid late callbacks that lead to crashes + 1d4cb8a6782b74a379098da58f383aaaf61989bd winrt: Try "connectToDevice" indefinitely + 80c84c4df0cb8dc5389542dde34317102f7b25b8 qlowenergycontroller_winrt_new_p.h: Use forward declarations instead of includes when possible + 14b0efe1d4e5addec5f577a2d01a3a0d9a1d931b Bluetooth: Compare the server channel when checking for duplicates + d67ca376b2111717de88596888f315fba05ef9c3 BlueZ: Fix leaking client socket when running QLEController Peripheral mode + c6c3241a4713b3ea89837341214625514951f712 Bump version + f6be1f73a810514335ab3d27e1d05825a36b06af Add changes file for Qt 5.12.4 + 0a49c93037e5f819f60486af318b6708e3b2b4aa qbluetoothsocket_winrt: Fix clang warnings + d755f7ab67a1f5b345caf09b1fc798d3c6e0ca34 winrt: Avoid threading issues when handling characteristic changes + e511f35a90608a4fb144b2c3dac37986d81cb41c winrt: Add service thread logging + 7a73ef639d461200213bdcd7f447ed99a14d0a4a Bump version + 3394807b3b0a234452b76e6295cb2362dc2c0cc0 Bump version + 76260fce994e9bac50c62b1c777e56d80848c0df Binary compatibility files for Qt5.13.0 for QtConnectivity + 0fc7e18bf7a24c9408602242d51a852905dfd0da Core/IO/Bluetooth - fix ambiguous conversions + 4d6a1030fd172641caacbc75b9e73cbc5b8da825 Doc: Replace example file lists with links to code.qt.io + 8a6d9c307851f3492ddc597f5f03e80f236a7857 Fix compilation with C++20 + 4ac755bb6e51891881b7477702be8ca917b60c8a winrt: Do not try to delete nullptr worker + 263fc5186325a7dd59a7533b98b3bf1296ea0d16 Do not handle PAIRING_VARIANT_PIN + 8110fdd4c6d80d05934768fa808a4cb187212fe0 Core/IO/Bluetooth - fix ambiguous conversions for macOS + c9d585da2ddd49108d7b56f480bcfc9d71b67dbf winrt: Add limitations to bluetooth overview page Change-Id: I020f7905e581877e2264b04032fb7db6237e44cb Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-101-1/+1
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-101-1/+1
|/| | | |/ | | | | Change-Id: I4cf492d5c7afde6b871ec4dc9198e9a794320e32
| * Fix QLEAdvertisingData::setManufacturerData on AndroidAlex Blasche2019-08-071-1/+1
| | | | | | | | | | | | | | | | | | The manufacturer data was not properly set because the related Java function requires a byte[] as second parameter. The equivelent JNI type is [B and not [B]. This caused a crash of the application. Change-Id: Iaa062ed9eb01e03d155583519d3f6a6bc01d72f7 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-271-1/+6
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-271-1/+6
|/| | | |/ | | | | Change-Id: I8c338f097a53c1235c0ea732f57421447125bde3
| * winrt: Add limitations to bluetooth overview pageOliver Wolff2019-07-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Same as on Android, Obex is not supported on winrt. Even though QBluetoothServiceInfo has a small passage about winrt's limitations when it comes to RFCOMM. Users might miss these limitations as they are quite hidden. Make them more visible by also having them in the overview. Task-number: QTBUG-62520 Change-Id: Ibdf1a9b334b7138301e833981e67c7813488bbd1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-2011-44/+40
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-2011-44/+40
|/| | | |/ | | | | Change-Id: I9493330b991b387163f46b8359a611aa7ff7745e
| * Core/IO/Bluetooth - fix ambiguous conversions for macOSAndré Klitzing2019-07-196-26/+26
| | | | | | | | | | | | | | This is a sibling of QTBUG-76847 on macOS instead of iOS. Change-Id: I3df6e28d65b9835f5f54e92d462d23423c48d835 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Do not handle PAIRING_VARIANT_PINAlex Blasche2019-07-173-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user has to enter a pin in such cases. Since QBluetoothLocalDevice does not have an API to return a pin it makes no sense for QtBluetooth to handle this type of request. Android will provide its own fall back form. This patch is mostly a revert of f8c0572ddcd. Fixes: QTBUG-76565 Task-number: QTBUG-70295 Change-Id: I61062ac84ce508f3b82c7359a60d5c9c5bba86a4 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * winrt: Do not try to delete nullptr workerOliver Wolff2019-07-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | When calling QBluetoothDeviceDiscoveryAgentPrivate::stop the worker pointer is cleared in disconnectAndClearWorker so there is no need to call deleteLater (which will just result in a warning). Change-Id: I2713474833b61a12018ecfa6f9eb11618ed025a7 Task-number: QTBUG-75089 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix compilation with C++20Marc Mutz2019-07-161-2/+2
| | | | | | | | | | | | | | | | | | Implicit capture of 'this' in [=] is deprecated in C++20. Fix by using explicit capture. Change-Id: I96132d83d87ae61986ba1b1ea3f9cf8e50059f1f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-113-8/+8
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-113-8/+8
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I48ae70ffcb475ced4a05619310f496527cdd4166
| | * Core/IO/Bluetooth - fix ambiguous conversionsTimur Pocheptsov2019-07-053-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... somewhat prospective fix (I do not have the new iOS yet), so far build never failed with my current SDK. Fixes: QTBUG-76847 Change-Id: Iab75c3cd47144cd83b679b1dbf82339e29c07bd1 Reviewed-by: André Klitzing <aklitzing@gmail.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Ia7d6c7678e68e0ea5943d06fdfbb5a150a87c149
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-092-0/+2
|/ / | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I4e66d50a4b98a728956e351d1603e26933dd02c7 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Binary compatibility files for Qt5.13.0 for QtConnectivityMilla Pohjanheimo2019-07-042-0/+10612
| | | | | | | | | | | | | | Binary compatibility files added. Change-Id: I0e4d8f361769e9a7484fa0b61a70b63d0b5f86e1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: Ibe7380268ccde015045aee61ba23b7569687d46d
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+39
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+39
|/| | | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idffd7323261ff89c9d7d69a33b88696c5e656015
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-262-1/+40
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-262-1/+40
| |/| | | | | | | | | | Change-Id: I38bcbad1bc8d0f03ba0ee3aa09f8c3e867dd6bca
| | * Add changes file for Qt 5.12.4v5.12.4Alex Blasche2019-06-061-0/+39
| | | | | | | | | | | | | | | Change-Id: Icb632a9e34f7c507153291322edc6f5c008b7b21 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| |/ | | | | | | Change-Id: I48c1d05ac0c9b231f7f1e077f3096274fe07435f
* | winrt: Add service thread loggingOliver Wolff2019-06-183-1/+42
| | | | | | | | | | | | | | | | | | | | | | We can run into problems if the list of low energy services is changed from threads other than the main thread. Make it possible to log this information in order to debug these problems more easily. Task-number: QTBUG-75907 Change-Id: Icda8dff45b8c1a72291ade0b1d6f734ab485a241 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | winrt: Avoid threading issues when handling characteristic changesOliver Wolff2019-06-244-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As callbacks do not necessarily happen on Qt's main thread, it is possible that we access the service list while it is being changed if we access it from the callback directly. Doing this can cause application crashes. Thus we hand back the information about a changed characteristic to the main thread via signal/slot and handle it from the main thread. With QLowEnergyControllerPrivateWinRTNew having the Q_OBJECT macro, we can no longer use forward declares for the GATT classes as moc chokes on these. Thus an include is used. Fixes: QTBUG-75907 Change-Id: I063794eecf904921ff55fab76a5bdde3a9aebf44 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qbluetoothsocket_winrt: Fix clang warningsOliver Wolff2019-06-181-18/+46
| | | | | | | | | | | | | | Change-Id: I71eafba9e7ff47dbfd89e3a650b83b55d1196693 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+59
|\ \
| * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+59
|/| | | | | | | | | | | Change-Id: I5745baded59252fefc1ee56cf9a3b662e310ba58
| * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Alex Blasche2019-05-071-0/+59
| | | | | | | | | | | | | | | Change-Id: I9dae4c32cfe713c66a0fa9765357dc8162353caf Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | qlowenergycontroller_winrt_new_p.h: Use forward declarations instead of ↵Oliver Wolff2019-04-252-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | includes when possible Change-Id: Ic995631dfc15e34c7f2902bfa850c97671c52367 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | winrt: Try "connectToDevice" indefinitelyOliver Wolff2019-05-132-103/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connectToDevice should not fail after a timeout, but try to connect to the device indefinitely. Unfortunately the behavior depends on the device's pairing status so two connectToDevice functions are needed. But the current implementations potentially wait indefinitely until the connection can be established. Change-Id: Iacb81e2c995974020b14d297528e54c326eb0453 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | qlowenergycontroller_winrt_new: Avoid late callbacks that lead to crashesOliver Wolff2019-04-252-83/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users may run into crashes on device disconnects in case that we run into a callback while the disconnects happen. Thus we have to avoid calling functions on deleted objects by avoiding lambdas if possible or using QPointers in lambda captures. Change-Id: Idcd3781bd396d4ef785191e4c65bae20e5149c04 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 10:47:35 +0000