summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.3' in qt/qtconnectivityv6.5.36.5.3Qt Submodule Update Bot2023-09-241-2/+2
| | | | | Change-Id: I87d310c938f5658a679bb262bcaf8b5988aef951 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.3' in qt/qtconnectivityQt Submodule Update Bot2023-09-211-2/+2
| | | | | Change-Id: I7064c82bc4a7adb429778c8b2a7828427dc385ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.3' in qt/qtconnectivityQt Submodule Update Bot2023-09-211-2/+2
| | | | | Change-Id: I6131c47950f5759f48f84c04e72fe075348e4ec8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.3' in qt/qtconnectivityQt Submodule Update Bot2023-09-181-2/+2
| | | | | Change-Id: I7f3c812b75023dcca5a5d586985712bafc894168 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-09-141-2/+2
| | | | | Change-Id: Ie2458774772c5eb672190d35b98fe03bdb8d6f18 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-09-121-2/+2
| | | | | Change-Id: Ife875320c152711b856cefc9969941a6b64f16ad 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 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> (cherry picked from commit 6d6f03dc9628091aa4e29e5b121dec36ab0d389d)
* Doc: All overviews list categorizationJaishree Vyas2023-09-111-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 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit af7bbe8ac5d35340b70ef0751e42a3e551edf5ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-09-061-2/+2
| | | | | Change-Id: I3b14930faeed8c3699badc188445d122a4626100 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add example categories for Qt NFC examplesMats Honkamaa2023-09-061-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>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-09-041-2/+2
| | | | | Change-Id: Iac268a37b9274526b8e8de5a5755ace5f5459bd3 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.5' in qt/qtconnectivityQt Submodule Update Bot2023-09-011-2/+2
| | | | | Change-Id: I49b864509a14cbdb5a50cca3443044ee358be7db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-301-2/+2
| | | | | Change-Id: I8be6d7a89a9dce8dd138d4d84fd4910981f64d96 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.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-291-2/+2
| | | | | Change-Id: Ic27cb0ad3bed6294b7dc286be31f66bde7d9f97d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-281-2/+2
| | | | | Change-Id: I12fe874d0b231d716906b6b7db8ffed5613752bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-251-2/+2
| | | | | Change-Id: Ie36dab5f075b5e4c994efab0436a2d90f3776992 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-241-2/+2
| | | | | Change-Id: Ifacfe72b852871bf6b271ddb7f799d2d0c5bea6b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-231-2/+2
| | | | | Change-Id: Ic752d2d713f9b4e1a5f6d9f418b7df813e5278e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-221-2/+2
| | | | | Change-Id: Ibbf984993461ca1035282fe14557f65ac2e99df8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-211-2/+2
| | | | | Change-Id: I5df9c979e247026c4f0ff867102dee5d4807b220 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-161-2/+2
| | | | | Change-Id: Ie14fcf17e227256150016835b16363132fcba25c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-141-2/+2
| | | | | Change-Id: I5f9ca20f89b7600555f7ccc5941a4fb00b75d995 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_QBluetoothUuid: add tests for (QString) ctorMarc Mutz2023-08-121-0/+6
| | | | | | | | | | | | We already have the string representation QFETCH()ed, so let's use it. This also seems to test op<<, by QCOMPARE() falling back to QDebug::toString(). Change-Id: Ibec66d4b7301e71509497a06b1b65e5cf9d108c2 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 9122bfcc4d332e95209a954785a700bf33adce59) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QBluetoothUuid: remove default case labels and fix the falloutMarc Mutz2023-08-121-8/+4
| | | | | | | | | | | | | | | Learn to love -Wswitch and avoid default case labels even at the cost of having a few enumerator cases "too many". They help catch mistakes, like, in this case, the missing handling of QBluetoothUuid::CharacteristicType::WeightScaleFeature. [ChangeLog][QtBluethooth][QBluetoothUuid] Fixed missing result of characteristicToString(CharacteristicType::WeightScaleFeature). Change-Id: I04b7cf9ee058ef5a8d202fff01fb347d315562f6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 439e818f7843b6a117e1bfe755e313022e14aafa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QBluetoothUuid: remove unused equals() method declarationMarc Mutz2023-08-121-3/+0
| | | | | | | | | | | This was never used, nor even defined, ever since the declaration was added in 9c59558afc71f36a82a1cab9ca0841119892e26a, so it doesn't need QT_REMOVED_SINCE(). It just was whitespace. Change-Id: I6a56cbe346455818c13cefb66c65887edbfcb0e9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 85e4b9f7c66bf653ec295a52305b5f1224eda3c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-111-2/+2
| | | | | Change-Id: I5387341d4968f0042eac2cbe9cfce902dcef8f23 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-041-2/+2
| | | | | Change-Id: Ibd6be2672beecf46c41edf5a2cbb00db34d0bb6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-021-2/+2
| | | | | Change-Id: I57123a0c065711e07e96ce2b1e2b463061269583 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-08-011-2/+2
| | | | | Change-Id: I2787b9fbba375333c1419a08bc65a53aa98bddb2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-07-281-2/+2
| | | | | Change-Id: I5118b1d41cda0cad714f08b8099f53496261cc93 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: List of all Qt overviews which are now termed as explanationJaishree Vyas2023-07-191-0/+1
| | | | | | | | | | | | | The autogenerated list of overviews was adding the \group command which included all the groups instead of overviews. The idea here is to categorize the overviews later on once we have the list of all overviews. Task-number: QTBUG-114762 Change-Id: I3cf53886be277abc86b5ec54d399cd6933fbe882 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit f7ae4d2aa8bfd37f5cf0a98afbe58328407784b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-07-171-2/+2
| | | | | Change-Id: Ibbc429203d738e503667f30107f63d567042a4ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-07-141-2/+2
| | | | | Change-Id: Ic1b033b8e1c5df2234cdb8bb6db113598fe52eec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-07-131-2/+2
| | | | | Change-Id: I9f9f854469865e6276b3c60a75e18e6f4cf7ad44 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Remove \ingroup all-examples command from the docsJaishree Vyas2023-07-122-2/+0
| | | | | | | | Task-number: QTBUG-115044 Change-Id: I83314f3b7955e1ef9c857bcc96c07f6f90b2f875 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 9cc12e95730c671eaaa669d131d031fc1453279f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* [docs] QBluetoothAddress: fix a grammer mistakeMarc Mutz2023-07-081-1/+1
| | | | | | | Change-Id: I7e0a616aaf227c9cfa3147a3bd5c19fc85778f88 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 2d4eac59f45807806372a32ccda40f0563f47aa1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Merge duplicate qHash(QBluetoohAddress) definitionsMarc Mutz2023-07-083-10/+6
| | | | | | | | | | | | | | | | | ODR violation, detected by -unity-build-batch-size 103. Fix by moving into a central header. Keep inline, so we don't export a new symbol and can pick back to 6.5. A follow-up commit will make make this a proper hidden friend of QBluetoothAddress. Task-number: QTBUG-109394 Change-Id: I6425e11bc4897ff9f41d25653e9e2ca8ac36631c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit d44a46e2bcc9ff119128759262c0422aa91bcd69) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-221-2/+2
| | | | | Change-Id: I5c1f97a1e59709613c00951b76927497e14f4ca8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-151-2/+2
| | | | | Change-Id: I8396b5dc1403e0f3f9937f91128897a5b9fe36d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.3Jani Heikkinen2023-06-151-1/+1
| | | | | Change-Id: I0ac3ec361a42456db41c066ac156363aa0123148 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-131-2/+2
| | | | | Change-Id: If8456f0a312dadb17822dd928f291d0389b4dabc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-121-2/+2
| | | | | Change-Id: I95dd1dfd5f3e7ee69a810ea0f2737557cca18cb9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-091-2/+2
| | | | | Change-Id: Id60bb0e15cbe05b6a95432adc853a26f34c681a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Windows: fix bluetooth pairing status requestIvan Solovev2023-06-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | When requesting for pairing status, we do not really know if the device is LE or Classic bluetooth device. Because of that, we try both options. The pre-existing code was trying to get an instance of BluetoothDevice first. In practice, the BluetoothDevice::FromBluetoothAddressAsync() method returned a correct BluetoothDevice even for LE devices, which was later leading to an incorrect pairing status, when accessing device.DeviceInformation().PairingStatus(). This patch re-orders the checks, trying to obtain an LE device first. My tests show that this approach works correctly for both LE and Classic devices, because the LE check fails for Classic devices. Note: Qt 6.2 is unaffected by this bug, because it already checks LE devices first. The bug was introduces during one of the later refactorings. Fixes: QTBUG-113318 Change-Id: I93ada1ca681ec2597809ecba117808d68c2dcb8c Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit 3d234d3b182f1759ecf8e5c092948c15f5c3ea4c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace Q_OS_OSX with Q_OS_MACOSTor Arne Vestbø2023-06-074-9/+9
| | | | | | | Change-Id: I5cc3f37b69807c441db57600030b57bc71512bae Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3685728ba6952b236fe4a2ff6ddcdd6a1dfd210f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove conanfile.pyTor Arne Vestbø2023-06-071-31/+0
| | | | | | | | | | The conan experiment has ended, and the file is only bitrotting nowadays. Change-Id: I2359fe3c3e21476896d5fb18e918ee5af3c7ae77 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit ea4dadfb3c04dcc460e4640a469ed0b942c129d3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-071-2/+2
| | | | | Change-Id: I9e4de76e61b88540c18eca33fcf06c1db09f06cf 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 12:08:26 +0000