summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.6.1' in qt/qtconnectivityv6.6.16.6.1Qt Submodule Update Bot2023-11-201-2/+2
| | | | | Change-Id: I133d2606298500e89181ee51bfc63177d7b9c75b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.1' in qt/qtconnectivityQt Submodule Update Bot2023-11-161-2/+2
| | | | | Change-Id: I093928c8c0435c706fb3f9c9c91f58449ccf789e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* BlueZ: treat AuthenticationCanceled as a PairingErrorIvan Solovev2023-11-102-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... when it is not triggered from our side. The linked Jira ticket, as well as some searches over the internet, show that some devices report org.bluez.Error.AuthenticationCanceled error when the authentication fails, not when it is canceled. At the same time, it is also possible to get this error code by trying to pair with the device, and then immideately cancelling the pairing, like this: QBluetoothLocalDevice dev; dev.requestPairing(address, QBluetoothLocalDevice::Paired); dev.requestPairing(address, QBluetoothLocalDevice::Unpaired); The pre-existing code was only considering the latter usecase, and so was not reporting AuthenticationCanceled as a PairingError. This patch introduces an extra flag to check if the pairing was canceled from our side. If that's the case - the old behavior is preserved, and we do not report an error. In other cases, a PairingError is reported. Fixes: QTBUG-118895 Pick-to: 6.5 Change-Id: I1fe246eb8a0da6efb62eddc9a843de7be0f7b2c5 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit 9815fa235e21321a2f4719a8f4b6f9837904d976) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-11-101-2/+2
| | | | | Change-Id: I6097c186167dc4e33567ff2fd5a9de344f93be8d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-11-081-2/+2
| | | | | Change-Id: Ic4cc7069dc1b9ed202bd864790ee54dc91656474 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Reset status of isSessionScheduled when starting a iOS NFC sessionJens Trillmann2023-11-071-0/+1
| | | | | | | | | | | | | If a user cancels the NFC popup and then starts a new session immediately after then isSessionScheduled gets set to true. This value has to be reset when the session gets started as isSessionScheduled==true leads to the QTimer always triggering a new NFC session. Pick-to: 6.5 Change-Id: I53d71d5c9b419d334ac6a229cff3e32aa81e9230 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 550e1c8ad5e8204c9942814bccc558c10faf197f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-11-031-2/+2
| | | | | Change-Id: If6deb72e2a3c1642e51015cc814586a011826741 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-11-021-2/+2
| | | | | Change-Id: I4cf9a78c9b6af547afafe363d4a603e00731c460 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-10-301-2/+2
| | | | | Change-Id: I5aed311ae14e25dcca015c942dc8187904d3e721 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-10-231-2/+2
| | | | | Change-Id: Id34da2454431d4c6549da2205912dfa06481e1ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-10-201-2/+2
| | | | | Change-Id: Ic9c4a7037658ae89e8d1797ce6497aecb9219652 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add thread protection to Android static string cacheJuha Vuolle2023-10-191-0/+2
| | | | | | | | | | | | | | | | | The string cache is accessed in the Qt Android main activity thread, as wells as in JNI callbacks which execute in arbitrary Java threads. For clarity: the usage in code looks like this: "valueForStaticField<QtJniTypes::XYZ" There is a small chance that the cache is accessed concurrently. Pick-to: 6.5 Change-Id: I34c26e22347f65614b18a000b5d61f0737e3b49e Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 62045a447c688935091ce6b9fb0cc8a0ce03343c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-10-181-2/+2
| | | | | Change-Id: I7a4c8d6bc9453e73714f39f6bc8a11940f7b5336 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-10-121-2/+2
| | | | | Change-Id: I5697b4954add90cb0746fb2b47c2cb3b594c02af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-10-091-2/+2
| | | | | Change-Id: I3d99bb159647905a9429a17efab0cb89cbc02400 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-10-061-2/+2
| | | | | Change-Id: Idee6bd74741cd39658deb5600e90d5c768769299 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-10-031-2/+2
| | | | | Change-Id: Icb8c0ec941034c6bd477356e7d5cd5fa75e66b8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-10-021-2/+2
| | | | | Change-Id: I67148dd2feee4bec2d4c03e96948f84daadb2f33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-09-281-2/+2
| | | | | Change-Id: Ic1a54a0c4b60fa500f9b92ea2184beac20c367d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Extend list of highlighted Connectivity examplesKai Köhne2023-09-262-2/+7
| | | | | | | | | Pick-to: 6.6.0 6.5 Task-number: QTBUG-117221 Change-Id: Idc1d7793c02bc1009f5cc43d30e3208b923ab0ee Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 4de43218466329a45cee1b588964ab811f4fedce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-09-261-2/+2
| | | | | Change-Id: I8dc4cc402a14f06842abd39c3bc8002779fca5d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-09-251-2/+2
| | | | | Change-Id: I7c9e7d081b83bdc772f851c52fe2eeb519eb3adc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-09-221-2/+2
| | | | | Change-Id: Ie011f0807b197a1085dbaade488c7cc28ff63f12 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: All overviews list categorizationJaishree Vyas2023-09-211-1/+1
| | | | | | | | | | | | The \generate list names are added for each categorized section with some explanation. Here, calling the overviews as explanations-(name of the section). The idea is to give general terms instead of specific phrases like 'core' etc, for better understanding. Task-number: QTBUG-115347 Change-Id: Ie7ab2df16d61f672a27fb75bd7aea1782a5d59e6 (cherry picked from commit af7bbe8ac5d35340b70ef0751e42a3e551edf5ec) Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Clear any pendingJob of BT LE controller in case of disconnectJuha Vuolle2023-09-211-1/+11
| | | | | | | | | | | | | | | | | | | | | When using QLowEnergyController in Client role and the remote peripheral disconnects, we clear any current resources. However it seems we didn't clear the pendingJob variable. If the pendingJob variable remains non-null, then the next time we use the controller, the "performNextIO()" function will return early as it waits for the previous job to complete. However in this case, as it is a remnant from a previous run, it never completes, and the application's QLowEnergyService::discoverServiceDetails() will silently do nothing (the new job is put into job queue, but never attended, because of this pendingJob not completing). Pick-to: 6.5 Fixes: QTBUG-115370 Change-Id: Idd14efcc1469c155ac46c6a35336e04fc5bd6aa9 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit cc337336fd51a13afc4ea09acf52c746fc747dbf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-09-201-2/+2
| | | | | Change-Id: Ic693099217446bcce626b79ebbdb29b1185ff17e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-09-191-2/+2
| | | | | Change-Id: I648baeec395402feee40e87a1f37da66a6c28707 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.1Jani Heikkinen2023-09-151-1/+1
| | | | | Change-Id: I7e0b6ab15ef245b49148c8df350dbd8d028987d8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-09-151-2/+2
| | | | | Change-Id: Iaf39cb2b57463dc386e1add8f9c4f4ece78794f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Allow to set user information after detection started for non NDEF tagsJan Moeller2023-09-121-3/+5
| | | | | | | | | | | | | | | | Prior to the NDEF implementation one could change the user information after the target detection started. The limitation seems to only effect NDEF tags, so all other tags should still be able to set the information at a later time. This allows to inform the user about the current progress of the process or inform about errors. Fixes: QTBUG-116563 Pick-to: 6.5 Change-Id: If82ea8c2056eb4c425626b06dac98462e3f0070c Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 76e0b4687ced7e3e54a60c674c9432a3161ce834) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityv6.6.0-beta4Qt Submodule Update Bot2023-09-111-2/+2
| | | | | Change-Id: I7681a5c718fb0bf2f783c80b7f7e46140679eb28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bluetooth autotests: do _not_ request permissions to use BTTimur Pocheptsov2023-09-053-14/+18
| | | | | | | | | | | | | | | | | | When running in "ci" test environment, only check them. Normally, requesting a permission may trigger a system (such as macOS) to show a popup/alert, requesting a permission to use Bluetooth. But on CI there is nobody to click 'Allow' button. Even worse though, the 'trick' with a nested loop was quite useless there, test was essentially timing out after 15m instead of interrupting the loop after 30 seconds. Now the part requesting permission is conditional with testing QTEST_ENVIRONMENT env. variable (which contains "ci" when running on CI. Task-number: QTBUG-115945 Change-Id: If7ec8e2bd7a7aa9602a31c5a0f00b756e9523012 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit b0344c5cf3fb85ad26a0cb36b86e085ffe80ee5b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-09-041-2/+2
| | | | | Change-Id: I762ab458f16f50161f2f7cd2beabe4eb031d0354 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Hide attributions for example icons from overviewKai Köhne2023-09-041-0/+3
| | | | | | | | | | | The code is only used in an example. Task-number: QTBUG-116580 Change-Id: I62786f01e2a368e7439c5fff3a83bff1ad2f0baa Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 8b1c26be6b984d92260d3599ec52de4c6c579dc6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-09-011-2/+2
| | | | | Change-Id: Ia21568a11d2d5e8000e8433492e2ee5a5548ec4e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Consider protocols that derive NFCNDEFTag in isNdefTag()Jan Moeller2023-08-301-1/+10
| | | | | | | | | | | | | NFCMiFareTag, NFCFeliCaTag, NFCISO15693Tag, NFCISO7816Tag all derive NFCNDEFTag. Therefor, the current implementation of isNdefTag() will return true for all of these, as they satisfy [conformsToProtocol:@protocol(NFCNDEFTag)]. Fixes: QTBUG-116563 Change-Id: I816cb84b2c06f1f9401fccb3867ab78d3ee075b7 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 7de85709d6828e7ee9dd4fffd683a8d67228311b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-08-301-2/+2
| | | | | Change-Id: I5ec55021a4c10eb207816d02ded08f1b9845a01b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-08-291-2/+2
| | | | | Change-Id: I15f33b29364a8a55d678314369bf7628dd176b16 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-08-281-2/+2
| | | | | Change-Id: I24b8e012e1a270e7e06b90107146f8c50fad0a7d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-08-251-2/+2
| | | | | Change-Id: Ia08170f8ca5e643588ead182175869668822d24d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-08-241-2/+2
| | | | | Change-Id: I11c196b79738e171a2ee3613ed28faf81933f5e2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-08-231-2/+2
| | | | | Change-Id: I64d0f02a64a750eda6cd06b41568272c00853814 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bluetooth: remove custom implementations of qbswap(QUuid::Id128Bytes)Ivan Solovev2023-08-232-18/+0
| | | | | | | | | | | | | Starting from qtbase/470b2b8ad9f28eaf24518dfa3f48cc13fcdc421f qbswap() is provided as a hidden friend for this type, so the custom implementations for Windows and Android backends in Qt Bluetooth are no longer required. Fixes: QTBUG-116341 Change-Id: I451de4249a082331f75c1db93ad420cf96d0e3cc Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 98cddeeb4a9e0c8686e505e5e6b9165970ec3060) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add example categories for Qt NFC examplesMats Honkamaa2023-08-211-0/+1
| | | | | | | | Task-number: QTBUG-116273 Change-Id: I99dbca4f4f4f933daced7ca2ff5ae9f1eee9d304 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 29117ff85d373c1eedfa42c1f05078098a76baa0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix translation context of QBluetoothUuid::WeightScaleFeatureFriedemann Kleint2023-08-211-1/+1
| | | | | | | | | Amends 439e818f7843b6a117e1bfe755e313022e14aafa. Change-Id: If08fc84a495d493b463cc71de43237b1cc950a5b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit a6bac31e41b71aeff6272cf8c34f02b237b21184) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QBluetoothUuid: magic_numbers -= 50Marc Mutz2023-08-181-5/+5
| | | | | | | | | | | | | | | | | | | Prevent code readers from having to compare the long lists of magic numbers in the various bluetooth-specific UUID constructors; they're all the same as the ones used in the quint32 ctor, so use C++11 ctor delegation to make all ctors call the quint32 one. This calls into question the need of the quint16 ctor, seeing as the quint32 ctor could just do the former's job with an implicit conversion. But removing it would allow users to pass any integral type to the QBluetoothUuid ctor, which is not the case atm, because the two integral ctors make each other ambiguous unless the arguments match either parameter types exactly. So leave it in. Change-Id: I40ddc47149cbb0526ad6488f32cc7f203e70a6b3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 08a0f404f60e5c02dfb3cf7b224feae7e93359b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QBluetoothUuid: inherit all ctors from QUuidMarc Mutz2023-08-184-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QBluetoothUuid clearly is-a QUuid, so it should have the same constructors, though it may add its own on top. Three Qt releases (6.3-6.6) of QUuid changes have, however, not been properly reflected in QBluetoothUuid, so fix it once and for all by adding using QUuid::QUuid; to QBluetoothUuid, thereby inheriting all the QUuid ctors (except SMFs) that QBluethoothUuid doesn't supply itself. This fixes or simplifies: - The Id128Bytes ctor, which we don't need to supply at all now. - The QString ctor, which was replaced by a QAnyStringView overload in QUuid a long time ago (6.3). - Anything else that we have missed in the past (GUID, e.g.). The superfluous constructors still have to be retained in the ABI, because QBluetoothUuid is unfortunately exported wholesale. This affects only the QString ctor. The other one was not in 6.5, and we don't provide BC with pre-releases of Qt. Add some variance to the fromString() tests now that we have QAnyStringView instead of just QString. Found in API-review. [ChangeLog][QtBluetooth] QBluetoothUuid now provides all the constructors that QUuid also provides (incl. from GUID and QAnyStringView). Change-Id: I2cb76a9a9cbc47f2fd4e637bdb41233d1ffc6972 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit aff0acdeee12acf6a85f479f160a0d4776f79d7c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QBluetoothUuid: inline the (quint128, Endian) ctorMarc Mutz2023-08-182-20/+4
| | | | | | | | | | | | | | | | | We can actually write a body that works for both unsigned __int128 as well as the legacy struct quint128, using QUuid::fromBytes(), so do that. This removes the need to keep a complex implementation behind the ABI boundary, and thus allows to remove the function from the ABI so we don't run into even more BiC problems once MSVC starts supporting __int128, possibly with just a newer /std flag which, as per current rules, isn't supposed to change the ABI. Change-Id: I1975cf68bc5f5421bf90f81a691ddf68bfa928dd Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 0f689ee079aa98b26efe097c8dc6652055f9010b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QBluetoothUuid: inline converting ctor from QUuidMarc Mutz2023-08-172-5/+12
| | | | | | | | | | | | | | | | | It really shouldn't be out-of-line. We should allow the compiler to see it as the no-op that it is. As a drive-by, pre-program the signature to pass by value come Qt 7, fixing a Clazy warning. We could already do it now, but since T and const T& don't overload, we'd have to take out the QT6_NEW_OVERLOAD bazooka, and it's not really worth it. When the code is inline, the compiler can see through the pass-by-reference overhead and avoid allocating the argument on the stack. Change-Id: Ic708bb9b2cacd4df22313b704de557dbda4d28fa Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 6bbf186d135e731e3c7b84a0c3cf9e74c946d32d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityv6.6.0-beta3Qt Submodule Update Bot2023-08-161-2/+2
| | | | | Change-Id: I6269e3b356344ee945dbcf4f89788999c0f7521f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 21:14:09 +0000