summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothuuid.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-061-3/+6
|\ | | | | | | | | | | | | Conflicts: examples/nfc/corkboard/corkboard.pro Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a
| * Improve QBluetoothUuid(QString) ctor documentationAlex Blasche2016-04-261-3/+6
| | | | | | | | | | | | | | | | | | It highlights the optional curly braces and the connection to QUuid. Task-number: QTBUG-52685 Change-Id: Iebfa84dc7f83fd2ef0aa02cb5e21b3f62de84d24 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@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-1/+7
|/ | | | | Change-Id: I37942b9123116693c5b4cf6dd9d0747b7cfb2d06 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'gerrit/5.5' into 5.6Alex Blasche2015-12-011-10/+17
|\ | | | | | | Change-Id: I4404df69bfdac335e9c1eb63e4ada3ba89b48b6c
| * Don't register meta types during static init time5.5Alex Blasche2015-11-301-10/+17
| | | | | | | | | | | | | | | | | | | | The QMetaType register my not be up and running by the time we attempt these meta type registration. Change-Id: I1a857a936a24b4b00a49574fac311c08c09b3d5a Task-number: QTBUG-49455 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Standardize DST terminology.Edward Welbourne2015-11-121-1/+1
|/ | | | | Change-Id: Id3fe0f89966a60f2f34ff971ad26319e95de6ae9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix GCC warningKonstantin Ritt2015-05-261-0/+3
| | | | | | | | | The actual message was: > warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Change-Id: I70f30da77a925e50032c5a82014af2e1aee511fb Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Further fixes to translated messages.Friedemann Kleint2015-03-051-1/+2
| | | | | | Change-Id: I7d5f9f8b9ad26ed607684c44e231eb0fcbcdc9ab Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Further fixes to Bluetooth UUID messages.Friedemann Kleint2015-03-021-11/+32
| | | | | | | | | | - Use Linguist comments instead of disambiguating strings for developer comments - Add Linguist comments for some abbreviations - Fix spelling. Change-Id: I5887be7c7c5ef9197b5bde8b0b46ba68690af0ef Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix spelling in messages.Friedemann Kleint2015-03-021-3/+3
| | | | | Change-Id: Icbbfe9cfb1e4187f2c043b85b8c0d19c9a82b6b9 Reviewed-by: Alex Blasche <alexander.blasche@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>
* Provide user visible strings/translations for new BTLE uuidsAlex Blasche2014-12-051-1/+81
| | | | | | Change-Id: I02e4b3518c57e120d46fdcc427663a5910e01a97 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add new environmental sensing descriptor typesAlex Blasche2014-12-051-1/+10
| | | | | | 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-11/+101
| | | | | | Change-Id: I57eff858c2e5700ac814d24fb173c269ebff5fd3 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-271-1/+6
|\ | | | | | | Change-Id: I6c1eabeea1b3397803e285d13cef147220ff5aa4
| * Add missing \since tags for new API introduced by Qt 5.4.Alex Blasche2014-11-131-1/+6
| | | | | | | | | | | | Change-Id: Ie51d6e549d80baae57864d4e0d43a1c58897f149 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Permanently register QBluetoothUuid with Qt Meta type systemAlex Blasche2014-11-101-0/+12
|/ | | | | | Change-Id: I7010e36d6abed116dbf0a941109d61208d901951 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add \since to all Qt Bluetooth classes which didn't have the tag yetAlex Blasche2014-09-261-0/+1
| | | | | | Change-Id: I50d818294cb53962bca2b08edbfdc4558890777c Task-number: QTBUG-36775 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Improve extended properties docs and fix qdoc errorv5.4.0-alpha1Alex Blasche2014-09-051-0/+2
| | | | | | | This adds some valuable piece of information from the Bluetooth spec. Change-Id: Idb0211e23a3fc03674f7878eaebea9c529dbd69d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Improve quint128 to QBluetoothUuid conversion performanceAlex Blasche2014-08-271-11/+3
| | | | | | | The change improves the performance between 8-10%. Change-Id: I342e669d3f18cd2179b65f1af172db52303ff44c Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.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>
* Update QLowEnergyDescriptor class documentation.Alex Blasche2014-08-181-0/+1
| | | | | Change-Id: I65d28f43862e95258c3115b79de839b884966119 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Don't construct QBluetoothUuid via string parsingAlex Blasche2014-06-161-0/+2
| | | | | | | This improves conversion performance. Change-Id: Ib78b2a6e24d0f44723be0bfb63b6aafc965188a6 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Provide means of translating descriptor types to user stringsAlex Blasche2014-06-111-1/+37
| | | | | | | | | 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-4/+123
| | | | | | | | | | | - 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-4/+17
| | | | | | | | | | | | | | | | 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 BTLE service names into QBluetoothUuid::serviceClassToString()Alex Blasche2014-06-021-0/+22
| | | | | Change-Id: I83a99666b8b16ae80ad7712785ee294cb340add1 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Merge branch 'dev' into btleAlex Blasche2014-05-261-1/+126
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+45
| | | | | | | | | | | | | | | | | | [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/+81
| | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'dev' into btleAlex Blasche2014-03-141-81/+73
|\| | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothuuid.cpp tests/bttestui/btlocaldevice.cpp Change-Id: Id16ab93ec61361950669da7eb232769c5dc4644f
| * Fix a few TODOs around the source code and remove obsolete onesAlex Blasche2014-03-131-1/+0
| | | | | | | | | | | | Change-Id: I01e867cb5efb231e7c85b0d106897b2f31448977 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Add missing Standard BT service/profile uuidsAlex Blasche2014-03-061-60/+75
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Unify the BtLE service class id descriptionsAlex Blasche2014-03-061-39/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'dev' into btleAlex Blasche2014-02-171-5/+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-5/+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-29/+279
|/ | | | | | | | | 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>
* Change the service properties in btchat exampleFabian Bumberger2013-10-011-0/+4
| | | | | | | And adding some links to the documentation. Change-Id: I7f9baf6a648547ef028f9521b0d88b88267fa301 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>
* Add missing Bt Core spec service attribute identifiersAlex Blasche2013-07-111-11/+12
| | | | | | | 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>
* 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/+3
| | | | | | | | 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>
* Language edits to the QDoc markupVenugopal Shivashankar2012-02-291-14/+13
| | | | | 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-3/+2
| | | | | | Change-Id: Ia99e5f8f9579c189379bce1a22de3d58b12ce5fc Reviewed-by: Alex <alex.blasche@nokia.com> Sanity-Review: Alex <alex.blasche@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 05:02:47 +0000