summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Build fix: Add errno.h include header for errno usageCristian Adam2019-11-011-0/+1
| | | | | | | | | | With Clang-Mingw the value for EADDRINUSE was not known, unless errno.h was included. Change-Id: I8a75a9c7b8f4578ab6c829d424d59a1c6185376b Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QBluetoothSocket(macOS) - fix _q_writeNotify's invocationTimur Pocheptsov2019-10-281-1/+1
| | | | | | | After the recent refactoring the writing ability was severed. Change-Id: Ib9f116cdbbbfd87593381cb62675cab4930a2ef1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update AndroidManifest.xml to be compatible with Qt 5.14Eskil Abrahamsen Blomfeldt2019-10-251-4/+2
| | | | | | | Necessary changes to be compatible with AAB changes in Qt 5.14. Change-Id: Ie5957a7e936644f43bd320f28053466794efcaf1 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-221-4/+2
|\ | | | | | | Change-Id: Ic9af5cb329f2fe15b74c76fc33c2beaaa5de4993
| * 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>
* | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Liang Qi2019-10-143-11/+25
|\| | | | | | | | | | | | | Conflicts: src/bluetooth/doc/src/bluetooth-index.qdoc Change-Id: If353b4ac63c72d6f94415e1349a206ade4ceb52e
| * 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>
* | Update plugins.qmltypes for 5.14v5.14.0-beta1Kai Koehne2019-09-302-2/+276
| | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I9bfa89f0df938cadc9fb74bb96f24e1c4debb61a Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix \since version for createCentral()v5.14.0-alpha1Alex Blasche2019-09-161-1/+1
| | | | | | | | | | Change-Id: I8d26fc7c4b7a93c4f839683feedd76cfbc1b5979 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Timur Pocheptsov2019-09-1213-27/+106
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Timur Pocheptsov2019-09-1213-27/+106
|/| | | |/ | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm src/bluetooth/qbluetoothserver_osx.mm src/bluetooth/qbluetoothserviceinfo_osx.mm src/bluetooth/qbluetoothsocket_osx.mm Change-Id: I24485ae835560fa1e57007fb684f6532db3e7922
| * 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>
* | | Do not make blocking dbus calls in dbus callbacksAlex Blasche2019-09-112-40/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing so blocks the main event handler which could lead to a sluggish UI experience. Fixes: QTBUG-77390 Change-Id: Id3624d602131c04e535584a7a4740ce2f751daaf Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Thiemo van Engelen <tvanengelen@victronenergy.com>
* | | Align deviceUpdated() & deviceDiscovered() behaviorAlex Blasche2019-09-112-43/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for QBluetoothDeviceInfo::deviceDiscovered() and deviceUpdated() is fairly specific. This change brings Bluez5 behavior in line with Android and Apple platforms. Change-Id: Ia819f8b8a9b5c2268edbee0a3005e0129d0553e6 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Thiemo van Engelen <tvanengelen@victronenergy.com>
* | | qbluetoothdevicediscoveryagent_winrt.cpp: Fix buildFriedemann Kleint2019-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | Add missing include for QMutex/Locker. Change-Id: I9e341b2ecaaae6e1b3a0bcf58ff7d890a4479091 Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* | | Merge "Merge branch 'wip/win' into dev"Oliver Wolff2019-08-2041-64/+4379
|\ \ \
| * | | Merge branch 'wip/win' into devOliver Wolff2019-08-2041-64/+4379
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtBluetooth] Added possibility to build win32 backend which also works on Windows 7. Change-Id: I03aabdec781d0e8cef2e500ee94ab423b5ba2b56
| * | | Update Bluetooth docs to mention Win32 backendwip/winAndre de la Rocha2019-08-173-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change updates the Bluetooth documentation to reflect the addition of the native Win32 backend. Task-number: QTBUG-40698 Change-Id: I8d2bc2146527a17f1f47fff541730b94f58286fb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Merge "Merge remote-tracking branch 'origin/dev' into wip/win"Oliver Wolff2019-08-12126-4380/+14546
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/dev' into wip/winOliver Wolff2019-08-07126-4380/+14546
| |/| | | | | | | | | | | | | | | | | | Change-Id: I83175151c0eef1a11d2f21648cc04c86e46777c1
| * | | | Enable the use of the Win32 Bluetooth backendAndre de la Rocha2019-08-0525-330/+558
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables the optional use of the Win32-based Bluetooth backend on Windows. By default, the WinRT backend is used, if supported by the platform. The use of the Win32 backend must be selected by the -native-win32-bluetooth configuration option. Task-number: QTBUG-40698 Change-Id: I6904bf077467d826e3ff5ad026ebae5f955f2e37 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | | win32-bt: fix warnings related to comparisons and initializersLubomir I. Ivanov2019-02-133-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silence a couple of type of warnings: 1) warning: missing initializer for member '_BLUETOOTH_DEVICE_INFO::Address' [-Wmissing-field-initializers] BLUETOOTH_DEVICE_INFO deviceInfo = {0}; Unlike C, C++ is not happy about this type of initializer Use '{}' instead to init all members to zero or 'NULL' properly. 2) warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (socket != INVALID_SOCKET) { 'socket' is defined as 'int', while 'INVALID_SOCKET' is derived from 'SOCKET' which is of type UINT. Cast 'socket' to 'SOCKET' before performing the comparison. Change-Id: I9fcbff1c60ae36b8a8fed63382a8ffc0157f4923 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | | Merge remote-tracking branch 'gerrit/dev' into wip/winAlex Blasche2019-02-1156-294/+10422
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I3402f42380068e3e6e7b3df8b15a712f0d86a3cd
| * \ \ \ \ Merge remote-tracking branch 'gerrit/dev' into win32Alex Blasche2018-11-22192-1109/+4776
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie99a67b63f8259227f42f5b464c6bbc16e79313b
| * | | | | | qbluetoothservicediscoveryagent_win: use lowercase importLubomir I. Ivanov2018-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The import of "WinSock2.h" fails on MXE environments because cross building from Linux to Windows makes it so that the filesystem is case sensitive. Change-Id: I6d89530f430eb45bf07154cffb5938eb3761ee1e Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | | | | win32-ble: store service handles until a service is destroyedLubomir I. Ivanov (VMware)2018-08-012-37/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, a problem was discovered that adding event registration on a descriptor does not work because the associated service handle is closed right after. For events to work a service should remain open if an event is registered for it. Store service handles (hService) is QLowEnergyServicePrivate. A handle is opened by QLowEnergyControllerPrivateWin32::discoverServiceDetails() and remains open until the device is disconnected. This removes the need to open/close services each time a Write/Read operation is performed on GATT characteristics / descriptors. Move the creation of the worker thread to connectToDevice(). Quit the thread in disconnectFromDevice() and also close any open service handles. Change-Id: Ia634af2e4225f5c1be93b0ddd17639c2dbd70c21 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | | | | win32: implement QBluetoothSocketEric Lemanissier2018-07-262-28/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2b33490694c8608edda3eb0cbe7b8d0dd233254 Reviewed-by: Lubomir I. Ivanov <neolit123@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | | | | Port win32 port to new QBluetoothSocketBasePrivate patternAlex Blasche2018-07-255-25/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3fc4e1078c63d7ca2af0e79353a62b9a9bb0c6f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>