summaryrefslogtreecommitdiffstats
path: root/src/bluetooth
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-091-0/+1
|\ | | | | | | Change-Id: I9e858c5b4413fc657addc4d731891c8180f072b9
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-021-0/+1
| |\ | | | | | | | | | Change-Id: Id9d1d013025262649c27e1b4d7cf43f2d7a9e11a
| | * 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>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-021-4/+2
|\| | | | | | | | | | | Change-Id: I4bb9257f062477cd7eece5692ace7afa5e64f9c6
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-261-4/+2
| |\| | | | | | | | | | Change-Id: I24fadee07534c20a35b9e4de5ba7eef787ef3bbe
| | * 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>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-312-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix build issues related to the QList->QVector change in QtCore. Change-Id: Ic4f5172e8771b3bbfa637c12c3a3381b2fc14928 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-261-1/+1
|\| | | | | | | | | | | | | | | Change-Id: Ida5422c406c27baf3f48fe2447ef09342cebd9b4
| * | | QBluetoothSocket(macOS) - fix _q_writeNotify's invocationTimur Pocheptsov2019-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After the recent refactoring the writing ability was severed. Change-Id: Ib9f116cdbbbfd87593381cb62675cab4930a2ef1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | ObjCStrongReference - re-implement via DarwinBluetooth::StrongReferenceTimur Pocheptsov2019-10-2310-126/+67
| | | | | | | | | | | | | | | | | | | | Change-Id: I99bc8761c648363cca89c74ecc587987e5e7cf01 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | | Core/IOBluetooth - minor refactoring in RAII classesTimur Pocheptsov2019-10-222-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prepare a switch from QScoped/QShared specializations in ObjC-RAII classes. Since StrongReference will become a parent for ObjCStrongReference, add 'take'-like functionality we have for free from QSharedPointer (used when we relegate the ownership and pass it to IOBluetooth) Change-Id: Iab7758e6c51c339bf7afc49007d921380d38ba51 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | darwin/btutility: make ObjCScopedPointer not using QScopedPointerTimur Pocheptsov2019-10-207-83/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use DarwinBluetooth::ScopedPointer (as a data-member). This also makes retain/no-retain policies more clear and visible/consistent. Change-Id: Icf406e8211864d201579ac87e0eccce8b283a8e7 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | CoreBluetooth: get rid of outdated ifdefsTimur Pocheptsov2019-10-202-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK >= 10.13 is required now, so we can get rid of ifdefs/dead code (old, deprecated constants). Change-Id: I98e8e22e1d707ccfc93c18773fb371767ea82f49 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | btutility: retire CFStrongReference RAII classTimur Pocheptsov2019-10-192-95/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCFType from core should suffice. Change-Id: Ie62bb3de76c50a4cbfde4c5e8f295a04f3f2c640 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-192-9/+16
|\| | | | | | | | | | | | | | | Change-Id: I30c0f050ea543fbd45e23d01ed4f79ee0cd75f5b
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-152-9/+16
| |\| | | | | | | | | | | | | | Change-Id: I044611763bf3912c99b2568de5146f112c4ac2ad
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Liang Qi2019-10-142-9/+16
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * 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 remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-148-27/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/bluetooth.pro Change-Id: Ibc52464c7d607b13950eb1e67f565a9909541026
| * | | Remove usage of PRIVATE_ and PUBLIC_HEADERSOliver Wolff2019-10-113-21/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | pro2cmake does not like them Change-Id: I2fafdfff587fe76076417a53a082e467274db728 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Rename qlowenergycontroller_p... to qlowenergycontroller_dummyOliver Wolff2019-10-114-6/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | These files are no private headers/implementations but dummy versions of qlowenergycontroller. Change-Id: I2553ff933f45585edd690d807bf3c85a1906d1ad Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix build without deprecations and Qt major version set to 6Simon Hausmann2019-10-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The version disables some deprecated tool Apis and for the regular Windows build the same change as commit ccc1544f5ff929f466df8c790a4e7595e177a720 is needed. Change-Id: I7473df0b8f0e51cc30dc640c09c77f61310185be Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Bluetooth: change prefix in Obj-C class namesTimur Pocheptsov2019-10-0831-68/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a follow-up of the recent file/namespace re-naming in QtBluetooth. Previously, the prefix was 'OSXBT'. This prefix is needed because: - Obj-C classes cannot be defined inside a C++ namespace, thus - A very generic name like 'DeviceInquiry' is potentially problematic. - We use QT_MANGLE_NAMESPACE, but for non-namespaced build it does not help. To make these names somewhat unique, I've introduced 'OSXBT' prefix with 'OSX' for a platform and 'BT' for 'Bluetooth'. 'OSX' part of the prefix is now outdated and I'm replacing it with 'Darwin'. Also, if a resulting name is still ambiguous I add 'Classic' to the name ('LE' was already in place where needed). Change-Id: I4cb6069c96f4159dd6cc0f94823454ea6c82b1ef Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-047-42/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp Change-Id: Ie540a926afa800a73df6fedb23adb6502996a81b
| * | | Fix Qt6 buildAlexandru Croitor2019-08-018-45/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepend namespace to text stream operands and fix deprecated function and enum usage. Change-Id: Ib9c74f940173f678d7c5af143cd2fd4e8da982e7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | | | IO/CoreBluetooth - update namesTimur Pocheptsov2019-09-2755-251/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obsolete 'osx' dir -> 'darwin'. Since we already prefix source names with this 'darwin', outdated and misleading suffix 'osxbt' is becoming simply 'bt' in file names. Remove osxbluetooth_p.h - in the past it contained some workaronds for some broken enum declarations inside the CoreBluetooth, since they all gone, no header is just ... includes two other headers, thus is redundant (I can include any of this include explicitly when needed). Change-Id: Ide0e7d19629cf31637db9871ff94a9084c29d0ed Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Rename the Darwin-specific logging categoryTimur Pocheptsov2019-09-2620-274/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_BT_OSX -> QT_BT_DARWIN. Merge two previous definitions into one, no need to differentiate between tvOS/watchOS/iOS/macOS - they are all Darwin-based. Change-Id: I024d36c798292ffa14f8a9f3def242a5ae7b1e56 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | Rename '*_osx' files to '*_macos'Timur Pocheptsov2019-09-2611-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this is how we call this OS these days. Change-Id: I679fbe888c0b695e2eefe5369c095c5dcab01600 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | | IO/CoreBluetooth - clean the code up for Qt6Timur Pocheptsov2019-09-2633-276/+236
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Make naming more consistent - merge two namespaces 'OSXBluetooth' and (the recent one) 'DarwinBluetooth' into one named 'DarwinBluetooth', since CoreBluetooth is supported by: tvOS, watchOS, iOS and macOS (aka Darwin). Change-Id: I8e7b0f3626f8982ea06493eef8abf058501197f4 Reviewed-by: Oliver Wolff <oliver.wolff@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 remote-tracking branch 'origin/5.13' into 5.14Timur Pocheptsov2019-09-1210-26/+31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm src/bluetooth/qbluetoothserver_osx.mm src/bluetooth/qbluetoothserviceinfo_osx.mm src/bluetooth/qbluetoothsocket_osx.mm Change-Id: I24485ae835560fa1e57007fb684f6532db3e7922
| * | 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 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 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 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 branch 'wip/win' into devOliver Wolff2019-08-2038-31/+4318
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 remote-tracking branch 'origin/dev' into wip/winOliver Wolff2019-08-0781-4229/+3488
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I83175151c0eef1a11d2f21648cc04c86e46777c1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 15:59:12 +0000