summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-121-3/+3
| | | | | Change-Id: I4bfbbd3cecda16282828acd405c31cad37ee017c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* 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>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-081-3/+3
| | | | | | | | | | | | | | | Change-Id: I7a545df78ed2c1bc8f12c7a2fc2be544ce096f18 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-051-3/+3
| | | | | | | | | | | | | | | Change-Id: Ifd1bdd3a898ca3609e533272cb451c13cf7c07d4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-021-3/+3
| | | | | | | | | | | | | | | Change-Id: I5210e3bab39263c71a1f7298a09b4f33b5ff2aa2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-11-021-3/+3
| | | | | | | | | | | | | | | Change-Id: I21a27d9729da9bcddf337777b4fa732388c9fa81 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-022-8/+4
|\| | | | | | | | | | | Change-Id: I4bb9257f062477cd7eece5692ace7afa5e64f9c6
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-262-8/+4
| |\| | | | | | | | | | Change-Id: I24fadee07534c20a35b9e4de5ba7eef787ef3bbe
| | * 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>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-314-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix build issues related to the QList->QVector change in QtCore. Change-Id: Ic4f5172e8771b3bbfa637c12c3a3381b2fc14928 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-291-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Idf88b11cc9966f297a25c388477a9b871001fc26 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-10-261-1/+1
|\ \ \ \
| * | | | 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>
* | | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-261-3/+3
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I490fd3c00c7104a159561a2c7418db626d7c7e1a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I9a337627c0c82a1da1de6e5e673cc0ad76e1795d Reviewed-by: Simon Hausmann <simon.hausmann@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>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I061941ede352be304b3f491c4b5c7c7979f8e579 Reviewed-by: Simon Hausmann <simon.hausmann@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>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-191-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I263b8ce56d58a09cbbcc1c6a888445713ec59752 Reviewed-by: Simon Hausmann <simon.hausmann@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-194-12/+25
|\| | | | | | | | | | | | | | | Change-Id: I30c0f050ea543fbd45e23d01ed4f79ee0cd75f5b
| * | | examples/nfc/poster: Remove empty "icons" prefixOliver Wolff2019-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The prefix does not contain any files and was never used. Change-Id: I0c265a30c5ccc168a2fe55fb03861bc5eee9733a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-153-11/+25
| |\| | | | | | | | | | | | | | Change-Id: I044611763bf3912c99b2568de5146f112c4ac2ad
| | * | 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 dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-181-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Id50d169796143da2b0f17f3dabf2b1e7a349ce7c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ice8adb7a0372f846616d42b8874d3b04a00281a6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: If4d709aa620304efaac4e4287a000a0523726ef8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I3ef458a5446557c3f2990bf90b09a50675379fe1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-161-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: If9672882dadba5d5f2f3b0f2f651cb6f5fc70cbd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I5b4354b6a8149a8339b2d4382e9a9edd8c9a8909 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-141-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I161309915cfc461b2747b0955194eec4125eaab8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-10-1414-543/+365
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-1414-543/+365
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/bluetooth.pro Change-Id: Ibc52464c7d607b13950eb1e67f565a9909541026
| | * | | imports/nfc.pro: Remove QDeclarativeNearFieldSocketOliver Wolff2019-10-113-505/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class has never been supported properly and has been commented out in the .pro file since forever. Change-Id: I0dabb747a6f2c1c8a476980c4835e5701a3c7830 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | | Remove usage of PRIVATE_ and PUBLIC_HEADERSOliver Wolff2019-10-114-30/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-012-2/+276
| | |\| | | | | | | | | | | | | | | | | Change-Id: If3339c7b17edf7897762ec343162a383c4c9eea4
| | | * | 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>
* | | | | Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2019-10-131-3/+3
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Ia8c44b564aeed5a6fa189cf0bc4445289ebbbd28 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 12:26:40 +0000