summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.6.2' in qt/qtconnectivityv6.6.26.6.2Qt Submodule Update Bot2024-02-091-2/+2
| | | | | Change-Id: If3aec43eee7a98f992c69838b3c26a85e4843f95 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qtconnectivityQt Submodule Update Bot2024-01-311-2/+2
| | | | | Change-Id: I1b7be047476f371926292746fe73aa658ba42ae5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qtconnectivityQt Submodule Update Bot2024-01-301-2/+2
| | | | | Change-Id: I50c74a66e6b5a55617fa1e2a67574ffff32c940e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qtconnectivityQt Submodule Update Bot2024-01-271-2/+2
| | | | | Change-Id: I1c69002b107627665c470abe62ae6ab7d4615e1f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qtconnectivityQt Submodule Update Bot2024-01-251-2/+2
| | | | | Change-Id: I6cd21c878c4a485a2754978ba549a9c93661fbd6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qtconnectivityQt Submodule Update Bot2024-01-241-2/+2
| | | | | Change-Id: I8e32c7e2393960e813d931688d53eb8a78d2dfd3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2024-01-221-2/+2
| | | | | Change-Id: Ibfc6fda3ada7936ac50e8383b5c2666098a25d93 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2024-01-181-2/+2
| | | | | Change-Id: I62588c59a7087ec15e2d0ca37cd14561e1816a78 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Examples: Use versioned CMake targets for Qt modulesKai Köhne2024-01-178-25/+25
| | | | | | | | | | Task-number: QTBUG-113277 Change-Id: I4885e6df894e24c2fdacccc4e58530ee9b190968 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 91c3e3dceaaaf27e7e92425e99f42898871fb6c1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f87eb7401c50cf8fca61e49f06e1bfbb52964639)
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2024-01-171-2/+2
| | | | | Change-Id: I56d0b1412483370eaa0c72429125a1ef21f619ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Tweak description of Qt NFC examplesKai Köhne2024-01-113-8/+10
| | | | | | | | Change-Id: I784aea736d77df873289141535dcbe20f7c0d131 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit aca4a5649b5459f2f507de73bee351d171744d3f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ec88b0f5f452db7d100beb6fe33c16bb3e35ef4f)
* Doc: Tweak Qt Bluetooth example documentationKai Köhne2024-01-103-6/+10
| | | | | | | | | | | | Linkify Qt Bluetooth, and add tags. QtBluetooth will create a link to https://doc.qt.io/qt-6/qtbluetooth-module.html Change-Id: I9da8bda1591fae26fbe0bde7ac86371af4b9e71c Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 619c20be1274778ff3a9344cd7f5b13f085bc956) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 7d458f96c45474ee20ca3c2f7aaf91a07427aeee)
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2024-01-081-2/+2
| | | | | Change-Id: I49c752a88e87bc043d26e57306e9477a4ce48071 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* NdefEditor: do not clear the existing message before readingIvan Solovev2024-01-062-1/+7
| | | | | | | | | | | | | | | | | | | | | The read operation can be cancelled, or might fail for some reason. In this case, the user does not expect the existing entries to be deleted, so do not clear the message before reading. If the read is successful, the existing message is replaced by the new one, so no action is required here. Update the example documentation to clarify this behavior. Amends 115b4d947adf90a706f76de831f34960e3c62a9c. Fixes: QTBUG-120410 Pick-to: 6.5 Change-Id: Ibaf00fb3c661abcc39b5d758e57ee5a837c0e270 Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> (cherry picked from commit b55674cbabb6250a415eeba96671a937045e4fd3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ee3e3cfc26ce9d9af2b1b8dd6f960514a0b20b55)
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-12-251-2/+2
| | | | | Change-Id: Ifdcc48cb514487099ea850678a614aa802aac8b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update BTLE Heartrate Game example UIIvan Solovev2023-12-2132-177/+460
| | | | | | | | | | | | | | | | | | | | Improve the example according to the new design: * Apply new colors * Rework layouts to match the updated design * Use icons in the notification/error box * Apply new font sizes * Update screenshots in the docs, convert them to webp so that they do not take too much space. * Disable the Start button on the Measure tab if the device is not connected, or if the proper service is not discovered. * As a drive-by - fix the wording in the docs. Fixes: QTBUG-118905 Change-Id: I90669ea05c5c6b76eb711862c494f1180dbd8dd7 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit 375e0e2c74adad9b609f5e48dffb88b07158bbfe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c3f69a2da4ee563f056eb0da52f0e8ae75a858db)
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-12-191-2/+2
| | | | | Change-Id: I311412be451a005b3f2e014a5b275e4db34b6538 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bluetooth Windows: fix segfault in COM de-initIvan Solovev2023-12-151-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | While doing COM initialization/deinitialization, we always implicitly assumed that QCoreApplication instance is available. However, if the Bluetooth objects are re-parented to the main application, the QCoreApplication instance will already be removed by the time we want to delete the Bluetooth object (and call COM de-init). Fix it by caching the main application's thread, and using it instead of QCoreApplication::instance()->thread() in the mainThreadCoUninit() helper method. This commit still assumes that all Bluetooth objects are created *after* the main QCoreApplication instance. Amends 340b84a5578f78d7a399e369e900ac991d9e0da2. Fixes: QTBUG-119063 Pick-to: 6.5 6.2 Change-Id: I450e4e14039ca27fcfd1f3f131789b049e1edb03 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit f762e9b646e240d9e8d3d7de928ae1333227c8a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 0e8bd451adef1ce67b1260fc0062c5a7e0c2ce3e)
* Windows Bluetooth: gracefully handle device disconnect during detailed ↵Ivan Solovev2023-12-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | service discovery Discovering service details in an asynchronous process, which means that the user may actually disconnect from the device while the discovery is still in progress. This means that we could end up in a situation when the discoverServiceDetailsHelper() is called with an empty serviceList. In this case, requesting for a specific service from the serviceList returns a nullptr, which may later lead to a crash. Add a nullptr check to gracefully handle such situations. Fixes: QTBUG-119060 Pick-to: 6.5 Change-Id: Iebdff67a12e6550979535ae5bac659ddae57b010 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 35f853837793b6d526815140021013cf03cc80b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3593b019e8c20d1fcae28d88448fc87fb99e7c3b)
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-12-081-2/+2
| | | | | Change-Id: I25950d6d9f53c42ea64b5aedc9fa731fb343ea8c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-12-011-2/+2
| | | | | Change-Id: I94e9224b5ecf22dec36678b13b3658e692e932d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bluetooth Chat example: update UIIvan Solovev2023-11-2727-25/+160
| | | | | | | | | | | | | | | | | | | | | | | * Add some icons for Light and Dark themes. Implement switching between themes by listening to QStyleHints::colorSchemeChanged() signal and manually picking the proper icon. * Rework the desing to get rid of the unnecessary "Quit" button, and also change the layout of buttons in the connection dialog. * Update the screenshot in the documentation. As a drive-by fix, make sure that the cursor is always at the end of QTextEdit before showing a new message. The user can change the cursor position by clicking/selecting the text, and this could previously lead to some bugs in message visualization. Fixes: QTBUG-118875 Pick-to: 6.5 Change-Id: Ia3a9dec3dae0d1411643ed851eba0ab4dc96a47f Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 6eb66322f0933de004baf35a96c5dd06d5d62ff6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtconnectivityQt Submodule Update Bot2023-11-271-2/+2
| | | | | Change-Id: I1f672a9d42ed6f849d54acdf154e97d8b6ed3828 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-211-2/+2
| | | | | Change-Id: I2a7355d8656f79dc1a7438ead9d03c53e67f4119 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-171-2/+2
| | | | | Change-Id: I1f5103950075e55bd46a23d1e6cba200e0e67141 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.2Jani Heikkinen2023-11-171-1/+1
| | | | | Change-Id: Ida246c780e5944b0b32f1c2ed022995c9f9ba07c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Silence expected java exceptionsJulian Greilich2023-11-151-2/+2
| | | | | | | | | | | | | | | Since we expect the calls to "connect" and "close" in checkIsTargetLost() to fail with IOException when the target was lost, we dont need to print the exceptions as log warning. This restores the behavior like it was before the port to the new Qt 6 Android APIs (7d2c6ae66fd61be56b35ae0c59354b695a02d6c7). Pick-to: 6.5 Change-Id: Ic9e14a58827f8b24865202012708644b903d5d70 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 0692168870463c7f32434b5ee1b0e6d762e078fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 07:08:36 +0000