summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-281-2/+2
| | | | | Change-Id: I6e534237f26a3d650b8c3850d7fecece1dc69253 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 Pick-to: 6.7 6.6 Change-Id: I90669ea05c5c6b76eb711862c494f1180dbd8dd7 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-211-1/+1
| | | | | Change-Id: I7c4730cf7213e870059bc881228001add29153b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-191-2/+2
| | | | | Change-Id: I32bf08d76027b54115e5641a53bf6717d5f1f505 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-181-2/+2
| | | | | Change-Id: Iff084f2a3be2308064d22270de5ea7df392b6952 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-151-2/+2
| | | | | Change-Id: I16dd9e3b5f4cc537ba6b066055561ac4bd396cf6 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.7 6.6 6.5 6.2 Change-Id: I450e4e14039ca27fcfd1f3f131789b049e1edb03 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* 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.7 6.6 6.5 Change-Id: Iebdff67a12e6550979535ae5bac659ddae57b010 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Don't use staticAssertTypeMismatch to inform about an unsupported valueVolker Hilsheimer2023-12-141-1/+1
| | | | | | | | | The assert-helper will go away soon, so replace it with the proper solution. Pick-to: 6.7 Change-Id: I6b38ed0189b316d6091144dd0a96b6ec77078af1 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* Bump version to 6.8.0Jani Heikkinen2023-12-131-1/+1
| | | | | Change-Id: I8aec740862534b669befd9c40c59174833f8d507 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-131-2/+2
| | | | | Change-Id: Ic9b5ff4864c30390c9819740cd5cd5a5703b714a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-101-2/+2
| | | | | Change-Id: Ib4fce1e75c8a515f9a76cf0890e4e4606b321145 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-091-2/+2
| | | | | Change-Id: I8d36b99aa4b07e5d91cf4dc039564c9a06e7f660 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-081-2/+2
| | | | | Change-Id: I962dbd2fd3f2e176030ff2b635c38bdadd34ad32 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-051-2/+2
| | | | | Change-Id: Iecc3c883ea529e5ed033e848f530a3315b70ca71 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-041-2/+2
| | | | | Change-Id: Iabc17354b9d9a507614ac00bab4b4861fbd2e42a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-12-011-2/+2
| | | | | Change-Id: Ic32fb2cb324e4b7bc96de3f98cd2c8377570f6b2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-301-2/+2
| | | | | Change-Id: Id329dacdda45b2d348ca7fa3a22236a08d1a78fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-291-2/+2
| | | | | Change-Id: Iec78823479bc2c28d8efe724ef90a3479401f2c0 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.6 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>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-271-2/+2
| | | | | Change-Id: I53894064e77d9ed406de25256e77e5f46ef1ee23 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-241-2/+2
| | | | | Change-Id: Iefd8f42186268ea86bfa4e1f1a9159945a670295 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* PCSC: Make polling interval adjustable via environmentIevgenii Meshcheriakov2023-11-232-2/+17
| | | | | | | | | | | | | | | | | | | | Allow overriding the default polling interval using QT_NFC_POLL_INTERVAL_MS environment variable. Reduce the default polling interval to 100 ms to make the library more useful with readers that produce beeps when new tags are detected. Long polling intervals may lead to users removing tags from the reader before QtNfc is able to read them. [ChangeLog][QtNfc][PCSCLite backend] The polling interval is now configurable using QT_NFC_POLL_INTERVAL_MS environment variable. The default polling interval was reduced to 100ms. Fixes: QTBUG-105526 Change-Id: I74c3f3bb88dafa5e389536d88b3837910e91d345 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-211-2/+2
| | | | | Change-Id: Ibb533f3cf1ffe2ae5be99d04af9f57a0892d4526 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-201-2/+2
| | | | | Change-Id: Iee11c20c8074c29abd85b48cb9826552f74454dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix template information for QNdefRecord::isRecordTypeLuca Di Sera2023-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QDoc parses a project, it parses the source code to extract the user-provided documentation and perform sanity checkings based on the code itself on it. When QDoc parses an "\fn" command as part of this process, it tries to understand, based on its intermediate representation built on the information extracted from the code-base, which "documentable element" the "\fn" refers to. When QDoc performs this "matching" process, it takes into consideration only a certain amount of information. For example, no checking is performed over the template declaration of a callable. Due to some upcoming documentation, where two callables are indistinguishable to the current process, as they differ only in their template declaration, QDoc will start to take into consideration the template declaration of a callable when matching. This implies that an "\fn" command should now provide information parity, with regards to template declaration for callables, with the code-base so that QDoc can perform the match correctly. The documentation for `QNdefRecord::isRecordType` is not in sync with the intended target template declaration. Hence, add the missing information to the relevant "\fn" command. Task-number: QTBUG-118080 Change-Id: I86ff66d085db8f6c1600c7f807d995e348407219 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-161-2/+2
| | | | | Change-Id: Ifde5f2409726f4fd02b0d84fe51f402e4236c0b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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.6 6.5 Change-Id: Ic9e14a58827f8b24865202012708644b903d5d70 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-151-2/+2
| | | | | Change-Id: Ia19df5f0cc7a8a091d42f7c0b2c4b2682445c118 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-131-2/+2
| | | | | Change-Id: Idd580d817d207b61269cc3540eb4abf59321fef2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-111-2/+2
| | | | | Change-Id: Ie801d21bb86a99a0dee18b502948bdc4cb16c2d3 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.6 6.5 Change-Id: I1fe246eb8a0da6efb62eddc9a843de7be0f7b2c5 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-091-2/+2
| | | | | Change-Id: I82c77a38e609fd341ba3ea33003b453306065453 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.6 6.5 Change-Id: I53d71d5c9b419d334ac6a229cff3e32aa81e9230 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-021-2/+2
| | | | | Change-Id: I8b37670c766e11d527ae03c9cc18e210f45196f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-11-011-2/+2
| | | | | Change-Id: Id026c62e1da321dca58e8b3a6099eefd3df8de19 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android Bluetooth: Change static string cache to use QStringJuha Vuolle2023-11-015-42/+54
| | | | | | | | | | | | | | | | | | Relates to change 944200b5a9705a7617f82cdaf5caf8932380aba4 which effectively terminates the application with a warning if QJniObjects are accessed from different thread they were created in. QJniObjects are not inherently thread-safe, as it is not easily possible to synchronize the access with Java-side threads. This change makes the internal string cache to use QStrings instead of QJniObjects. The strings that are cached are constants as per Android documentation, and don't change at runtime. The runtime query and related caching of these strings is more of a measure to protect against changes between eg. Android releases. Change-Id: I76fa607ab6062da504071f3bb0161a30c27361e8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-10-301-2/+2
| | | | | Change-Id: I0e5c3684a319c0a70c43ca25d968828dc72039e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-10-281-2/+2
| | | | | Change-Id: Iad223a551e831726bb64366579d540063150846c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: don't rely on implicit cast of declared QtJniTypes to jobjectVolker Hilsheimer2023-10-271-3/+3
| | | | | | | | | The operator jobject() should be removed from declared QtJniTypes in qtbase, as it's dangerous. Prepare for that by calling object(), which returns the wrapped jobject as well. Change-Id: Ic067532abf4c539e026560577504124eac6050bd Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* 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.6 6.5 Change-Id: I34c26e22347f65614b18a000b5d61f0737e3b49e Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-10-181-2/+2
| | | | | Change-Id: Iea194ac19daa95384143a881836d4b70e70a662e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Include what you need: <QPointer>Marc Mutz2023-10-132-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | All these TUs relied on transitive includes of qpointer.h, maybe to a large extent via qevent.h, though, given that qevent.h is more or less the only public QtBase header that includes qpointer.h, something else seems to be at play here. Said qevent.h actually needs QPointer in-name-only, so a forward declaration would suffice. Prepare for qevent.h dropping the include. The algorithm I used was: If the TU mentions 'passiveGrabbers', the name of the QEvent function that returns QPointers, and the TU doesn't have qpointer.h included explicitly, include it. That may produce False Positives, but better safe than sorry. Otherwise, in src/, add an include to all source and header files which mention QPointer. Exception: if foo.h of a foo.cpp already includes it, don't include again. As a drive-by, insert some empty lines as include block separators. Task-number: QTBUG-117670 Change-Id: If58fbfe87e750969acbbe7f0b9eb4784bdfcad47 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-10-091-2/+2
| | | | | Change-Id: Id87a51dff82bb9cbb90ebf8518a93a098057c4ae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-10-051-2/+2
| | | | | Change-Id: Ib04550db22bdc4fce6e5abb605519d497248d112 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Change Axivion configurationMatti Paaso2023-10-041-22/+3
| | | | | Change-Id: I7b3f3a402c7961bdc7979e421ffeda4d6cc4abd3 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-10-041-2/+2
| | | | | Change-Id: Ic28d1e5ba0d71e3ccbcae18f2eb6b34867b53f32 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-10-021-2/+2
| | | | | Change-Id: I3730615373abc990744cc6c33b25f1da89004f9e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: Slash-separate class nameVolker Hilsheimer2023-09-291-1/+1
| | | | | | | | | | | | Fixes dependency update after merging of class look-up in base. The JNI FindClass function must be called with a slash-separated, fully qualified class name, otherwise it throws an exception. Fix this, while evaluating whether we should accept the performance hit of always normalizing class names. Change-Id: Ic716f8830c04b12c76ef869efe8da8dcbfeba3f3 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* Update dependencies on 'dev' in qt/qtconnectivityQt Submodule Update Bot2023-09-291-2/+2
| | | | | Change-Id: Ibabe8733c57dc1a061769652360195df28cc64ee 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-07 23:15:42 +0000