summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.0' in qt/qtconnectivity6.2.0Qt Submodule Update Bot2021-10-041-2/+2
| | | | | Change-Id: I913a69bfeaaa7cc23ec11ce15d4a7ce1ade5782c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtconnectivityQt Submodule Update Bot2021-10-041-1/+1
| | | | | Change-Id: Iee06f6d740a82ac56473307596a52d55af8c6f69 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENTIikka Eklund2021-10-021-1/+1
| | | | | | | | Current value should be empty to reflect the branch status. Pick-to: 6.2 Change-Id: Ife8bbd9f3c3ab625eb9900189151705a0c602281 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.2.0' in qt/qtconnectivityv6.2.0Qt Submodule Update Bot2021-09-251-2/+2
| | | | | Change-Id: Ic999b57996dbee61c33616116803bd79c1f8a54c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtconnectivityQt Submodule Update Bot2021-09-221-2/+2
| | | | | Change-Id: If1e5569a9fedbf6287dff9c81286242066cae7b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtconnectivityv6.2.0-rc2Qt Submodule Update Bot2021-09-211-2/+2
| | | | | Change-Id: Ie3aa6927a62505b295f373b40836026cc97f91e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtconnectivityQt Submodule Update Bot2021-09-191-2/+2
| | | | | Change-Id: Ic6486b67647a878b2eb3f66a7a19c0a98c5255eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtconnectivityv6.2.0-rc1Qt Submodule Update Bot2021-09-141-2/+2
| | | | | Change-Id: I826e609367142541270094b7d40b39ac8a4fff24 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtconnectivityQt Submodule Update Bot2021-09-111-2/+2
| | | | | Change-Id: I67bf463cb4846b1deb11014972674768a69132d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtconnectivityQt Submodule Update Bot2021-09-111-2/+2
| | | | | Change-Id: I22e5ea0547a49cc76cbcc14a8f78f23b0984bbeb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtconnectivityQt Submodule Update Bot2021-09-101-2/+2
| | | | | Change-Id: I5d40c7d4e44f067111c54556c232c2bffa577429 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtconnectivityQt Submodule Update Bot2021-09-101-2/+2
| | | | | Change-Id: I291b2f49f1b63fe24b6c2235019a907d90324b03 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-081-2/+2
| | | | | Change-Id: I0fbae8b57cb2ac04d3ddc58ce8e73feec8a67888 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* IOBluetoothDeviceInquiry: manually interrupt Classic scanTimur Pocheptsov2021-09-071-18/+45
| | | | | | | | | | | | | | | | If 'inquiryLength' was ignored. This change is to be revisited after the official release of macOS 12 - it could be a bug in beta versions and all this additional timer machinery is a waste. The fact I was able to observe the same problem with 10.15.7 is quite troublesome though. Fixes: QTBUG-95960 Task-number: QTBUG-95686 Change-Id: I56685e07791dd751aec81bebbeefde19d31555df Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit cf8ade9fd809e62cb61bb897b3789c75a48f5996) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Update the depends list to fix a broken linkVenugopal Shivashankar2021-09-071-1/+1
| | | | | | | | | | | The qmake manual is a separate module that must be in the depends list. Task-number: QTBUB-96181 Change-Id: I5d20539de93789e9f6c123284cd47fd3e4b7ebca Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit c27804dec55aa01b57123a3a3dd9d6d77c88f11c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-071-1/+1
| | | | | Change-Id: I91312c5541a89b6fbda9d4a467fa36fa5c811440 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove remaining cases of isBluez5()Alex Blasche2021-09-073-30/+6
| | | | | | | | | | initializeBluez5() takes care of it now. Task-number: QTBUG-75342 Change-Id: I5c8f3594e7f0c862f6a513d28467d5c9b31f9e40 Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> (cherry picked from commit 160c07a275787ff227e8bf3a8b325b83f8b41583) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-071-2/+2
| | | | | Change-Id: I3594b37f0ae0fe39f52333254225f282faba3893 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-061-2/+2
| | | | | Change-Id: I64cb852333c1b098ed29e68fe33ee2efbfaf1b54 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix qdoc warningsVenugopal Shivashankar2021-09-063-4/+3
| | | | | | | | | | | | qt5/qtconnectivity/src/bluetooth/doc/src/bluetooth-cpp.qdoc:27: (qdoc) warning: Can't link to 'Qt Bluetooth QML Types' qt5/qtconnectivity/src/bluetooth/doc/src/bluetooth-index.qdoc:28: (qdoc) warning: Can't link to 'qmake' qt5/qtconnectivity/src/bluetooth/doc/src/bluetooth-index.qdoc:28: (qdoc) warning: Can't link to 'Build with CMake' Task-number: QTBUG-96181 Change-Id: Ia5e9296f91e392aba59f555f6e93dcbe054f08cc Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 1bc0261f928da78aafabeac2373bb207092f3ca6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-061-1/+1
| | | | | Change-Id: Ibbafca0e20cb25ddcf5fd5abd1588f11e6d57cf5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-041-2/+2
| | | | | Change-Id: If1b5986ddd23a3ffd072370525462c8ffd83e484 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-041-2/+2
| | | | | Change-Id: Icfd47d1facd4fa72b9e79bab9441e81d3bec170a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-041-2/+2
| | | | | Change-Id: Ic3a5863852304ffeea6e6cba71e6521943bb63b0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-031-2/+2
| | | | | Change-Id: Id4c7911d63e4bae8c26cad411ea2de0d70f7b470 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-031-2/+2
| | | | | Change-Id: I1daf63ae8b6d99a10e940cf0995365aad7fe8171 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-021-1/+1
| | | | | Change-Id: I694292476fcdda9e27e69fd636f22190b128ff8e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityv6.2.0-beta4Qt Submodule Update Bot2021-09-021-2/+2
| | | | | Change-Id: Id4e64c7df985df466b9eef092d14ae9e140ed667 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Better naming of member variables in QBluetoothSocketBasePrivateAndreas Buhr2021-09-015-40/+40
| | | | | | | | | | | | | | There was a naming asymmetry in QBluetoothSocketBasePrivate: The receiving buffer was named "buffer" while the sending buffer was named "txBuffer". This was really annoying. This patch renames the receiving buffer to "rxBuffer" so we have symmetric names: "rxBuffer" / "txBuffer". Change-Id: Ifbd5032cd5f6229543525496f6f656b7b7fc2e25 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit dfa11d982c8414083d6ed777f743cd078e53f972) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: Ied3340cc63b874fefcc05a66a77b77a48077833c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: I2ba83fde39f20fbd23c286ecee2deb410b3dce8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-08-311-2/+2
| | | | | Change-Id: Icd52933e7498c789f8fbd60e5346fe59f000aab0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Rename variables and methods having Bluez5 in their nameAndreas Buhr2021-08-308-117/+109
| | | | | | | | | | | | | | A lot of variables and methods were doubled, having one for BlueZ4 and one for BlueZ5. Having dropped support for BlueZ4, there is only the Bluez5 variant left. The "Bluez5" part of their name is not required any more. This patch removes it. Task-number: QTBUG-75342 Change-Id: I4c27cddbcca465b877cb7f2b7372a85a38de0076 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit a3ac0c1c4f52a882a0223310108c05b7d85ccc1e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove BlueZ4 XML files and their usageAndreas Buhr2021-08-3020-774/+0
| | | | | | | | | | | The BlueZ4 DBUS interface is described in XML files. After removal of BlueZ4 support, this patch removes these. Task-number: QTBUG-75342 Change-Id: Ib6da83d2dd6cb5c5c3875d1a717bd8e30a617eb4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 69b4f604744322699abb8e4baffbe38d60c504f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove BlueZ4 detectionAndreas Buhr2021-08-301-15/+4
| | | | | | | | | | | Even though BlueZ 4 is no longer supported, detection for it was still in the code. This patch removes it. Task-number: QTBUG-75342 Change-Id: I274993a93404603a51499f8ea967193b450bb6da Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 84a66e212fdfe01ba7ddc9da2e380022305cde41) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-08-301-2/+2
| | | | | Change-Id: Iba90cccd9d9539c3c3b46db525667eefe8ab2ec8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove BlueZ4 code paths in QLowEnergyControllerAndreas Buhr2021-08-271-55/+21
| | | | | | | | | | This patch removes the BlueZ 4 code paths in QLowEnergyController. Task-number: QTBUG-75342 Change-Id: I02482b508a05914f6c4b15d5d33034d86c3df988 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 20fbdb4ac7ec9528a54cdc776f3d61a64427cfc9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove BlueZ4 implementation from BluetoothServiceInfoAndreas Buhr2021-08-272-141/+63
| | | | | | | | Task-number: QTBUG-75342 Change-Id: Iec175eccb4e41ab7e1a93a79595fafe1cad6ee18 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 5f5778ed6eda8c682c8e317bd3ad16eefb1f7ea2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove BlueZ4 implementation from BluetoothSocketAndreas Buhr2021-08-271-52/+19
| | | | | | | | Task-number: QTBUG-75342 Change-Id: Iabaa559747de369571be64be87da8b0200470ead Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit fbaf177a6f71fbc79ab2670f4a27b9669285829d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Support builds with ConanIikka Eklund2021-08-262-0/+57
| | | | | | | | | | | | | | | | | | | The recipe uses Conan's supported way to inherit from a given base class via 'python_requires_extend'. The qt-conan-common package implements a base class for Qt leaf module recipes. The build steps in leaf modules are mostly identical so it makes sense to put those in the base class. Dependencies are read by the base class from the 'dependencies.yaml' which is the same file the CI system uses. Task-number: QTBUG-94914 Change-Id: Ib09faf140df0c2c8862c4b09c14d1a6929cca8b4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit bf05dc0ea34e6d2a2a242fd1ba0d11bbc5175a95) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-08-251-2/+2
| | | | | Change-Id: I4c45ad44d5e96f86e310526f490a6b911c64e5b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix qdoc warningsVenugopal Shivashankar2021-08-232-7/+7
| | | | | | | | | | | | | | qt5/qtconnectivity/src/bluetooth/qlowenergydescriptor.cpp:47: (qdoc) warning: Can't link to 'handle()' qt5/qtconnectivity/src/bluetooth/qlowenergycharacteristic.cpp:46: (qdoc) warning: Can't link to 'handle()' Also, dropped unnecessary \l commands against potential auto-links. Task-number: QTBUG-95860 Change-Id: I3b0286703b65365fef202438d21e4eca446a1c2f Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 72a11fd0a35e9048d1646c93ae0a4795018a58e0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-08-211-2/+2
| | | | | Change-Id: Ib2b1321d719cc284351c03d7bf016fdf8261293b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-08-201-2/+2
| | | | | Change-Id: I5e9862971b71bf42388fb762d7414723875986e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace "Getting Started" by "Using the Module" in QtBluetooth docsAndreas Buhr2021-08-192-3/+11
| | | | | | | | Fixes: QTBUG-94894 Change-Id: I628af802fc589e163dc9087fa7fc3fd7db71caba Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fdf6b6bd84f3ae853b97946f2e9ea3d7a5c35426) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Beautify QtBluetooth 6 migration guideAndreas Buhr2021-08-191-55/+71
| | | | | | | | | | Better styling, working links. Fixes: QTBUG-94905 Change-Id: I3526c64fd15897bd0e0e33c4f78c9852d54fd2ae Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 391fd67c685bc8fe1f769b5ae3c65095f1322ad0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't mention changes in Qt 5.7 in QtBluetooth introduction docsAndreas Buhr2021-08-191-3/+0
| | | | | | | | | | | People reading the introduction are probably not interested in changes long ago. Task-number: QTBUG-94894 Change-Id: Ie9511d90aee6ce356f0f6ad7a4c91d518bc71e97 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit f58597edfe7b228698d3977fce498d292259c092) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-08-191-2/+2
| | | | | Change-Id: I946e8f654b8dc6206cf83976a7709cb7dc8d2d04 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove documentation of previously removed Qt Bluetooth QML typesAndreas Buhr2021-08-194-141/+1
| | | | | | | | | | | | The QML interface to Qt Bluetooth was removed. This patch removes some remainders in the documentation. Task-number: QTBUG-94894 Change-Id: I4e4d0ae354ccc1b88aa8530b89e6786752b8af49 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 77c628bc7c7025361abce4a01496434e42bc21e5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtconnectivityQt Submodule Update Bot2021-08-181-2/+2
| | | | | Change-Id: I9313d1e41eb889171375bae3863c6c4233ced62e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>