summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothdeviceinfo.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix documentation warningsTopi Reinio2019-11-111-1/+1
| | | | | | | | | | | | | | | Add a \class command for QNearFieldTarget::RequestId whose members were already documented. Remove QDoc comment marker for QBluetoothDeviceInfo::serviceUuids() overload as its declaration in the header file is omitted by a QT_DEPRECATED_SINCE macro. Fix linking issues and missing parameter documentation. Fixes: QTBUG-79814 Change-Id: I9804fcbd559f1924a2a7b16fdbdfb23398605eaa Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add ability to have multiple manufacturer data per manufacturer IDAlex Blasche2019-08-081-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current QBluetoothDeviceInfo API is somewhat limited as it cannot clearly express the nature of multiple data sets per manufacturerId. The API should really offer: QMultiHash<quint16, QByteArray> QBluetoothDeviceInfo::manufacturerData() const QVector<QByteArray> QBluetoothDeviceInfo::manufacturerData(quint16 manufacturerId) const Adding overloads and usual deprecation warnings cannot be done during Qt 5.x time though as the required overloads merely change the return types. Overloads which only offer different return types are not permitted by C++. The plan is to replace w/o deprecation in the Qt 6 branch. To avoid the API change during Qt 5.x, this patch leverages QHash::insertMulti(). There is a minor API behavior change that comes along with this approach. Previously, old manufacturer data for a given manufacturerId was replaced by the new value. Now, the data is added. The fact that multi inserts are permitted are a minor behavioral change too but actually desired by the nature of the bug this patch addresses. Note that there is some talk that QHash's insertMulti() capability may disappear in Qt 6. Task-number: QTBUG-76615 Change-Id: I35b737cb48d6ed83112ebe0b22853ca307f20115 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Fix build with deprecated APIs disabled since 5.13Sona Kurazyan2019-08-071-2/+29
| | | | | | | | | | | | The DataCompleteness enum has been deprecated since 5.13, but some of its uses are still compiled for all versions. Make the related code and docs compile only when the enum is defined. To keep source compatibility, add another version of serviceUuids() returning a QList and not taking a DataCompleteness parameter. Task-number: QTBUG-76491 Change-Id: I20e045230df18e7211ef9982d98ed6e77ec87d16 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Remove winrt TODOs about manufacturer dataOliver Wolff2019-03-251-1/+0
| | | | | | Task-number: QTBUG-71943 Change-Id: I35f9aedb0615d8341f93f67b4549d1e9a03c9cb9 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Replace QBluetoothDeviceInfo::LANAccessDevice with NetworkDeviceAlex Blasche2018-10-091-1/+4
| | | | | | Change-Id: I4b52ded8fbf310ecfd64c82308046f8d10108597 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Deprecate QBluetoothDeviceInfo::DataCompleteness with Qt 6 in mindAlex Blasche2018-10-091-2/+34
| | | | | | | | | | The patch deprecates the mentioned enum and all users of it. In addition, QList usage is replaced by QVector (which is a design pattern in Qt). Task-number: QTBUG-62425 Change-Id: I63e8dceb03ed231d0d06709896a1aad2b6bb31a3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix various qdoc warnings in QtBluetoothAlex Blasche2018-09-181-3/+3
| | | | | Change-Id: I49653a6ac6fa004987d32365f96a6407f50e207c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Add QBluetoothDeviceDiscoveryAgent::deviceUpdated signalAlex Blasche2018-08-231-1/+33
| | | | | | | | | | | | | | | | | | | | | | | For iBeacons and such, it's normal to keep discovering indefinitely, while the advertisement can sometimes carry changing payload data. This signal helps keep the UI up-to-date. Changed setManufacturerData to return a bool indicating whether the data was really modified or not, to avoid sending deviceUpdated in case it was not changed. For convenience QBluetoothDeviceInfo::manufacturerData() was added. WinRT and Apple platforms do not emit the new signal yet and relevant TODO items were added. Done-with: Shawn Rutledge <shawn.rutledge@qt.io> Task-number: QTBUG-46008 Task-number: QTBUG-69747 Change-Id: I6d6b373f6cc5ee3dd6af2ad05d8640dbd25c5d6a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Spell QBluetoothDeviceInfo::manufacturerIds correctlyShawn Rutledge2018-08-211-1/+1
| | | | | | | Amends 0f930cddefe386c6b6f65b8b11342c9e76876a9b Change-Id: Ic3769d30198d3607a1fee218d9f2e90b9addf2d3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add manufacturer data to QBluetoothDeviceInfoAlex Blasche2018-08-171-1/+54
| | | | | | | The initial patch was contributed by Thiemo van Engelen. Change-Id: I45fad793ba092ab2820e606d8bf8807afa3e911e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-161-4/+4
|\ | | | | | | Change-Id: I3eec9a22565585d4fc40831d609a3083ce99a52c
| * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-161-4/+4
| | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I97f7a0d6d2ca351395bed518f01d4365b986500a Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-1/+6
|\| | | | | | | Change-Id: I64352b6cc066255972874e2f9c28abff35f0d613
| * Document the meaning of QBluetoothDeviceInfo::minorDeviceClass()Alex Blasche2016-07-251-1/+6
| | | | | | | | | | | | | | A naming inconsistency was discovered and a related Qt 6 TODO was added. Change-Id: I171f8480009a3fc8c3ddc39cc2da03cf4a6eb9db Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-201-14/+20
|/ | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I856c13e2a6d4d12c46e1286b0ca1c092ee4608f8 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Improve QBluetoothDeviceInfo::address() documentationAlex Blasche2015-11-161-0/+6
| | | | | | | | | The address is not exposed on OS X and iOS and deviceUuid() should be used instead. Task-number: QTBUG-48746 Change-Id: I07f837ae8a01303c7d1fe27b8a8c174f288829c9 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Improve QBluetoothDeviceInfo::deviceUuid() documentationAlex Blasche2015-09-031-0/+5
| | | | | | | | | | The device uuuid is only used on OS X and iOS. QBluetoothDeviceInfo::setDeviceUuid() already stated this limitation. The getter function was not. This patch fixes the oversight. Change-Id: I900b885c922b4248abe6f60fe38deea952605bf8 Task-number: QTBUG-48022 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-161-7/+7
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I3822a6484e8f7a420330de1cb1aeb0c3d1cf41b7 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Fix qdoc warnings & adds missing changelog entry for recent API changeAlex Blasche2014-10-301-3/+5
| | | | | | | | | | | | | | 1.) Duplicated class documentation in service discovery agent code 2.) Added missing reference to "\a uuid" parameter in new QBluetoothDeviceInfo::setDeviceUuid() [ChangeLog][QtBluetooth][QBluetoothDeviceInfo] New deviceUuid attribute added to QBluetoothDeviceInfo Change-Id: I7f87d7b95e28b435cb646d284eb447dbdccf0c90 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QBluetoothDeviceInfo - add "non-addressable" devices supportTimur Pocheptsov2014-10-291-0/+62
| | | | | | | | | | | On OS X and iOS CoreBluetooth hides addresses from a user, providing NSUUID (similar to uuid, by generated by Apple) to identify devices ("peripherals"). Since we still must be able to somehow "address" these devices later, we use these (unique) uuids instead of addresses for LE devices: add a data-member, setter/getter/ctor + update operators '=' and '=='. Change-Id: I74b73c1413d7014e04cbfda6cef501defa15ed8e Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add QBluetoothDeviceInfo::UnknownCoreConfiguration enum valueAlex Blasche2014-10-161-1/+6
| | | | | | | | | | | | The value is needed for platforms which do not provide this type information. An example are Android versions below 18. The enum was added in Qt 5.4. Therefore we need to add the missing \since tag too. Change-Id: I23582e7500d8da6740b281ba9821d028c4f33e05 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add \since to all Qt Bluetooth classes which didn't have the tag yetAlex Blasche2014-09-261-0/+2
| | | | | | Change-Id: I50d818294cb53962bca2b08edbfdc4558890777c Task-number: QTBUG-36775 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Update license headers and add new licensesJani Heikkinen2014-08-241-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I7a8b8b787fcae9a178794364efdefe1021d10b1b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QBluetoothDeviceInfo::coreConfiguration() should return the QFlagAlex Blasche2014-06-041-6/+6
| | | | | | | | | Function name was slightly adjusted to reflect the fact that it's a flag. Change-Id: I9c1a2fe64b93c7ae7bd826d856f8b87f985d7473 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix BTLE related qdoc errorsAlex Blasche2014-06-041-3/+6
| | | | | | Change-Id: Id1a56b0ed050fd9cebee8738351e560b442d748f Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Merge branch 'dev' into btleAlex Blasche2014-05-261-17/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/bluetooth/bluetooth.pro src/bluetooth/bluez/bluez.pri src/bluetooth/doc/src/bluetooth-index.qdoc src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp src/bluetooth/qbluetoothdeviceinfo.cpp src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp src/bluetooth/qbluetoothservicediscoveryagent_p.h src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: I88b22c51a4ee95b067ef8d2b2fddb5cbff4566f8
| * Fix coding style in QBluetoothOleg Shparber2014-04-231-25/+28
| | | | | | | | | | | | | | | | Affected: QBluetooth, QBluetoothAddress, QBluetoothDeviceDiscoveryAgent, QBluetoothDeviceInfo, QBluetoothHostInfo, QBluetoothLocalDevice Change-Id: Ia5af61f87eafecfba56b75fa61b81014cdd38960 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge branch 'dev' into btleAlex Blasche2014-02-171-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/bluetooth/bluetooth.pro src/bluetooth/doc/src/examples.qdoc src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp src/bluetooth/qbluetoothservicediscoveryagent_p.h src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
| * Use QLoggingCategory to categorize the various debug output streamsAlex Blasche2013-12-201-2/+0
| | | | | | | | | | | | | | Task-number: QTBUG-32253 Change-Id: I193162407d0fc7eca83689e31f03e1641a494ab0 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Implemented Bluetooth Low Energy gatt service and characteristics discoveryNedim Hadzic2013-11-041-11/+49
|/ | | | | | | | | Bluez v4.x does not have total support for LE devices, a new approach, using gatttool command was implemented. Auto-tests and documentation will be in other commits. Change-Id: Iee711cc111199e15956052eebb7593bd3a5e27c8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Clean up QBluetoothDeviceInfoFabian Bumberger2013-09-101-18/+0
| | | | | | | This patch removes "ManufacturerSpecificData" because it is not implemented and some dead code. Change-Id: I95a142280835addf65fbedd4a26f3266c7dc0838 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove QtBluetooth and QtNfc namespace.Alex Blasche2013-09-091-2/+2
| | | | | | | | This is based on namespace discussions on the Qt project dev mailing list. We continue to use the Qt namespace. Change-Id: I6119d06662f7682c11f42d759f3218be1f5a7d6c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Update Copyright headersAlex Blasche2013-06-251-1/+1
| | | | | | | | | - Update Digia's copyright year - Add copyright to files without it - Convert old BSD to new LGPL license for auto test code Change-Id: I47f5c871c436f9c2731b235026434448719cc671 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Add QBluetoothDeviceInfo::operator!= which was missing.Milian Wolff2013-03-281-0/+10
| | | | | | | | The code just forwards to operator==, as is done as well by e.g. QBluetoothTransferRequest. Change-Id: I4db523124b6bd88bcb1f129d0742fc8ef376c61b Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Rename NFC and Bluetooth namespace macros.Aaron McCarthy2013-02-141-2/+2
| | | | | | | | Renamed to the namespace macros to follow what syncqt expects. This fixes missing namespace macro warnings printed by syncqt. Change-Id: I7be5a700e8435a559cb4c2e74938851233095887 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* Qt Bluetooth: Created \qmlmodule and \module pagesJerome Pasion2012-09-291-3/+2
| | | | | | | | These pages will list the C++ classes and the QML types in Qt Bluetooth. Removed extra groups. Change-Id: I27d7004d804cc0cc29af997f3a11fcc9f9477efb Reviewed-by: Alex <ablasche@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I4f07028d0bf0b3ba4c4649897b80687ea5e51abc Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-061-5/+5
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I40e6d40c8ca9b5e7b98a16aab3fac57ec84be63d Reviewed-by: Alex <alex.blasche@nokia.com>
* Language edits to the QDoc markupVenugopal Shivashankar2012-02-291-20/+20
| | | | | Change-Id: I13206b25dbd87ce0d066cb21842dfbd516bd2bbc Reviewed-by: Alex <alex.blasche@nokia.com>
* Modified the \brief text for the Bluetooth C++ classes and the QML elements.veshivas2012-02-281-1/+1
| | | | | | Change-Id: I3c455739afe9d63eb822a0462c7e786bd83259ee Reviewed-by: Gary Aish <gary.aish@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I84f8c423bd7748bbae495fedae696990414cee83 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* added documentation and examplesMichael Zanetti2012-01-231-2/+1
| | | | | | Change-Id: Ia99e5f8f9579c189379bce1a22de3d58b12ce5fc Reviewed-by: Alex <alex.blasche@nokia.com> Sanity-Review: Alex <alex.blasche@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-201-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I1c6ba5c87f0eca30b6f01f4245a032262d30f8ce Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-111-1/+1
| | | | | | | | Update copyright headers from before 2011. Change-Id: Ic34da6aa9bf8ba63d4e41c2135b4fdaf7c437360 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* added Connectivity namespaces (QtBluetooth and QtNfc)Michael Zanetti2011-11-111-1/+5
| | | | | | Change-Id: I5f3062c857e657a6d05ab29edfa2f1b48cb173f8 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Initial commit.Michael Zanetti2011-08-241-0/+529
From qt5connectivity.tar.gz, md5 317c149d6f8c07d09632353188582834
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 16:55:51 +0000