summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothuuid.h
Commit message (Collapse)AuthorAgeFilesLines
* QBluetoothUuid: add QDataStream operator<<,>>Thiago Macieira2018-10-191-0/+12
| | | | | | | Don't depend on QUuid's. Change-Id: I495bc19409f348069f5bfffd15516db994a430e4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Avoid wrong implicit cast leading to wrong connectToService() callAlex Blasche2018-01-251-0/+1
| | | | | | | | | | | | | | | | Prior to this change passing a QBluetoothUuid::ServiceClassUuid to connectToService() caused the port overload to be called rather than the QBluetoothUuid version. This patch introduces a ServiceClassUuid overload that avoids relying on implicit type conversion. There is a remote chance that this patch breaks existing code if the remote port was in the same range as the ServiceClassUuid range. In general the Bluetooth ports are below 100 though. Task-number: QTBUG-65831 Change-Id: I6574291ae6fee284466d84ecb91f21e3be89f6b2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Add default assignment operator for QBluetoothUuidAlex Blasche2017-10-191-0/+2
| | | | | | | | This was detected by clazy. Change-Id: I69c5a0921864b24dfdbf33fb54e8b85a7b600adb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Replace Q_NULLPTR with nullptrKevin Funk2017-09-291-2/+2
| | | | | Change-Id: Ica194c2568465a94d851ddeaf62ca71b33fe4464 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Rename qbluetoothglobal.h to qtbluetoothglobal.hOliver Wolff2017-08-301-1/+1
| | | | | | | | | | | | | ... and deprecate the former. By doing so we get the header file in line with other modules - see qtnetworkglobal.h for example. The include is not used in the examples so it is removed there. Change-Id: Ie6267738d4a45e45a0350d458a40654d8a952f4a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-211-2/+2
|\ | | | | | | | | | | | | Conflicts: src/bluetooth/qlowenergycontroller.h Change-Id: I15571e47fbf06545d46d1b9a9b2b47bf815ae293
| * Add explicit and make public headers compile with ↵Marc Mutz2016-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: I375361699615d0fc874e0b96a84543e233eff5f0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/dev' into neardAlex Blasche2016-01-261-14/+20
|\ \ | | | | | | | | | Change-Id: If9cf6718cbd619dd7ce38db2da274fe9d0a41fb7
| * | 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>
* / Add operator!= for QBluetoothUuid.Christian Kandeler2015-12-111-0/+1
|/ | | | | Change-Id: I37942b9123116693c5b4cf6dd9d0747b7cfb2d06 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix trailing commas in enumsAlex Blasche2015-04-201-3/+2
| | | | | | | This was caused by the new headersclean enforcing warnings as errors Change-Id: Idd595fc4cf78411a80ff3dbb46477d5130a04c3e Reviewed-by: Christian Stenger <christian.stenger@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>
* Add new environmental sensing descriptor typesAlex Blasche2014-12-051-1/+6
| | | | | | Change-Id: Id0ed9503da1cff66a04a83196cf61863289b98ab Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add newly adopted BTLE service/characteristic type uuidsAlex Blasche2014-12-051-0/+90
| | | | | | Change-Id: I57eff858c2e5700ac814d24fb173c269ebff5fd3 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update license headers and add new licensesJani Heikkinen2014-08-241-18/+10
| | | | | | | | | - 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>
* Introduce QLowEnergyDescriptorAlex Blasche2014-06-261-0/+1
| | | | | | | | | | | | | The class is based in QLowEnergyDescriptorInfo and exposes the found descriptor information. The only missing piece of information is the descriptor value. Extends the QLowEnergyController unit test in such a way that descriptor information is tested too (except for values). Change-Id: I6ba6a862fff48fbdd27cd8219d2eb8f6d0058aea Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Provide means of translating descriptor types to user stringsAlex Blasche2014-06-111-0/+1
| | | | | | | | | Also, this patch fixes the uninitialised m_type member in the QLowEnergyDescriptorInfo private implementation Change-Id: I6736d5f38738490bc4f0f53908f925361f1843bd Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Improve handling of QBluetoothUuid::CharacteristicType enumAlex Blasche2014-06-041-69/+70
| | | | | | | | | | | - Sort enum values based on their hex values - Add QBluetoothUuid::characteristicToString(CharacteristicType) - Rename QBluetoothUuid::CharacteristicDescriptor -> DescriptorType - Add a couple of missing \since tags Change-Id: I9724eb2f43c6978f07420bf6ec4c8557ad9efbaf Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Streamline some of the QLowEnergyDescriptorInfo related codeAlex Blasche2014-06-041-3/+4
| | | | | | | | | | | | | | | | 1. QLowEnergyDescriptorInfo::type() added 2. QLowEnergyDescriptorInfo ctor signature modified 3. QBluetoothUuid::DescriptorId enum renamed 4. QLowEnergyDescriptorInfo::uuid() changed its meaning 5. QBluetoothUuid(CharacteristicDescriptor) ctor added Starting from this change QNX is going to be broken. In particular point 2 cause breaks or bug. The focus is on santizing the API at this point in time. Change-Id: I7838f550410b6a0f94026b68ecf0751533eba3cb Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Merge branch 'dev' into btleAlex Blasche2014-05-261-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add QBluetoothUuid::protocolToString()Alex Blasche2014-05-261-0/+1
| | | | | | | | | | | | | | | | | | [ChangeLog][QtBluetooth][General] Added QBluetoothUuid::protocolToString(QBluetoothUuid::ProtocolUuid) which returns a human-readable string for the given protocol uuid. Change-Id: I26b9a1b47b1254ac8a49091c2854d1cfab0c66d6 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Service discovery via Bluez5Alex Blasche2014-05-221-1/+3
| | | | | | | | | | | | | | | | | | At the same time we shift the ServiceClassUUID to service name mapping to QBluetoothUuid. It was used by Android and now Bluez 5 uses it too. Task-number: QTBUG-32085 Change-Id: I9f2d4dc4e2997683485f2ba7aaefb646cb72fb75 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Check for QT_NO_DEBUG_STREAM for QBluetoothUuid QDebug helperOleg Shparber2014-04-281-0/+3
| | | | | | | | | | | | | | | | [ChangeLog][QtBluetooth] QDebug helper for QBluetoothUuid became aware of QT_NO_DEBUG_STREAM define. Change-Id: I20941c32560bfc6beaa8f4f465799af987d0b0cd Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge branch 'dev' into btleAlex Blasche2014-03-141-1/+9
|\| | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothuuid.cpp tests/bttestui/btlocaldevice.cpp Change-Id: Id16ab93ec61361950669da7eb232769c5dc4644f
| * Add missing Standard BT service/profile uuidsAlex Blasche2014-03-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | The BtLE related uuids will be added by the BTLE feature branch. This change adjusts the docs such that it becomes obvious whether a UUID is a service, profile or both. Task-number: QTBUG-36123 Change-Id: I487471c9227a0fe11f443c54d21a29b23a11e076 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Fix uuid value of ServiceClassId PnpInformationAlex Blasche2014-03-061-1/+1
| | | | | | | | | | | | | | | | Fo far it was using the GNSS profile uuid. Change-Id: Ifbe51353a6355d260c42d870656a78059e440181 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Unify the BtLE service class id descriptionsAlex Blasche2014-03-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The previous class ids where sorted by uuid. We should keep it this way even if sorting by alphabet is more convenient for the reader. This change is done to align the documentation with https://codereview.qt-project.org/#change,79960 Task-number: QTBUG-36123 Change-Id: Ib859c666b069f7c7f955823904e147db96021f34 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Implemented Bluetooth Low Energy gatt service and characteristics discoveryNedim Hadzic2013-11-041-1/+121
|/ | | | | | | | | 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>
* Remove QtBluetooth and QtNfc namespace.Alex Blasche2013-09-091-3/+3
| | | | | | | | 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>
* Add missing Bt Core spec service attribute identifiersAlex Blasche2013-07-111-0/+1
| | | | | | | Task-number: QTBUG-31728 Change-Id: I2d4410a3ac87bdf9e85805403bf3c6165d4967dd Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.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>
* Fix qmake warnings about incorrect header includes in public headers.Alex Blasche2013-06-211-1/+1
| | | | | Change-Id: I4b6ff895a021665b18b007c8bd8a7059cbba3ab1 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.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>
* Remove use of QT_{BEGIN,END}_HEADER macros.Aaron McCarthy2013-02-031-4/+0
| | | | | | | | These macros were removed from Qt Core and they are no longer defined causing qtconnectivity to fail to build. Change-Id: I7971cca9d51e7eb1e395e348efb471982e355527 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.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 "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>
* 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-2/+6
| | | | | | Change-Id: I5f3062c857e657a6d05ab29edfa2f1b48cb173f8 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* added missing service uuid for Hands-Free Unit ServiceMichael Zanetti2011-10-071-1/+2
| | | | | | | Change-Id: Id91da4990ede3941bd389ed0195e09abfce041bd Reviewed-on: http://codereview.qt-project.org/5974 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Split qconnectivityglobal.hMichael Zanetti2011-09-151-2/+2
| | | | | | | | | Split qconnectivityflobal into qbluetoothglobal.h and qnfcglobal.h like the other qt5 modules have it Change-Id: I16cfdd84411ac6da200872b3023c1c98778bb022 Reviewed-on: http://codereview.qt-project.org/4686 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Initial commit.Michael Zanetti2011-08-241-0/+177
From qt5connectivity.tar.gz, md5 317c149d6f8c07d09632353188582834
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 12:59:49 +0000