summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update doc for QBluetoothDeviceDiscoveryAgent::deviceDiscovered()Alex Blasche2017-06-291-1/+9
| | | | | | | | | | lowEnergyDiscoveryTimeout affects the emission behavior of deviceDiscovered(). This behavior change should be explicitly documented. Task-number: QTBUG-57847 Change-Id: I94bd7cb36935b376c34ba90f5de4e3084e87e883 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* QBluetoothDeviceDiscoveryAgent::start() should return early from errorAlex Blasche2016-07-211-0/+1
| | | | | Change-Id: I62ba10117b544e6a31a3fd92f8dbc65ea4ea3ff6 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Permit selection of discovery mode (btle vs classic)Alex Blasche2016-07-131-2/+62
| | | | | | | | | | | | This change introduces the new API but does not yet implement the specific selection. In any case BlueZ does not need any specific implementation as classic and BTLE devices are found using the same method. iOS does not need any specific implementation as it only supports BTLE discovery. Task-number: QTBUG-46253 Change-Id: Ie6365966091effe5f3a68f8a283657c7cb43b692 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Minor documentation fix for QBluetoothDeviceDiscoveryAgentAlex Blasche2016-07-131-2/+3
| | | | | | | | | Fix usage of \a where \sa should have been used and adds a documenation clarification. Change-Id: I9f9f95aee515ca8507835cbff3f348e8472922b8 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Add a warning when QBDDAgent::setLowEnergyDiscoveryTimeout is no-opAlex Blasche2016-06-241-1/+7
| | | | | | | | This can avoid accidental issues or wrong assumptions. Task-number: QTBUG-53012 Change-Id: I02024a640f89954d6e55b87825276ea6f5f3d862 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Add BTLE device discovery timeout APIAlex Blasche2016-06-151-0/+43
| | | | | | | | | | | | | | This timeout adjusts the BTLE device discovery. Some BTLE devices require some time to show up in such a search. In general the platforms use open ended search methodologies as their own usage pattern for BTLE device discovery too. So far Qt Bluetooth limited the time through a hardcoded value which the API user could not adjust. Task-number: QTBUG-53012 Change-Id: Ia37cebd4015b438db998c6b4a265f563c1a2f89f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-061-0/+2
|\ | | | | | | | | | | | | Conflicts: examples/nfc/corkboard/corkboard.pro Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a
| * Fix typo in Android permission nameAlex Blasche2016-04-131-1/+1
| | | | | | | | | | | | Task-number: QTBUG-52530 Change-Id: I6ae41b3f8998ffc18d8b8205c6bbe788e8c4898b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * Android: Ensure Bluetooth device discovery finds remote devicesAlex Blasche2016-04-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Android 6.0 Bluetooth device discovery requires new permissions (ACCESS_FINE_LOCATION or ACCESS_COURSE_LOCATION). Otherwise non-BTLE devices will no show up anymore. This patch adds the required permissions to QtBLuetooth. For details see http://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-hardware-id Task-number: QTBUG-52530 Change-Id: I7b64ab57c5c9ee2e08308eaa58d33708c5e31244 Reviewed-by: BogDan Vatra <bogdan@kdab.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>
* 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>
* Further improve the DeviceDiscoveryAgent class documentation.Alex Blasche2014-10-301-0/+8
| | | | | | Change-Id: I405b830a8c6199bef641329096de10cad14894fb Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add QBLuetoothDeviceDiscoveryAgent::UnsupportedPlatformErrorAlex Blasche2014-10-301-0/+4
| | | | | | | | | | | | | | | | | iOS does not support classic Bluetooth device discovery. However since iOS 5.0 it is possible to search for Bluetooth Low Energy devices. On pre 5.0 devices tLE scan is not possible and this error enum is going to be used. In addition the enum is utilized by the default backend which is used on unsupported Bluetooth platforms. [ChangeLog][QtBluetooth][QBluetoothDeviceDiscoveryAgent] A new UnsupportedPlatformError enum value added. Change-Id: I74b85782ba1e8ac55798171151b364d5dc0aa79f 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>
* Bluez5: Ensure device discovery returns meaningfull RSSI dataAlex Blasche2014-05-221-0/+10
| | | | | | | | | | | | | | | | | If the discovery process was started by QBluetoothDeviceDiscoveryAgent and Bluez wasn't already in discovery mode then the RSSI values are 0. The retrieval of RSSI data takes a bit more time. To find a compromise between speedy return of device scan information and the delayed RSSI information we continue to monitor the device scan and update RSSI information as the values are propagated by Bluez. However the deviceDiscovered() signal is not emitted again after an update. Only re-calling discoveredDevices() will return the most up-to-date RSSI values. Task-number: QTBUG-32085 Change-Id: Icb6566d51503a6004fa3f25c499fc7f941bd7fee Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Bluez5 support for QBluetoothDeviceDiscoveryAlex Blasche2014-05-091-4/+2
| | | | | | | Task-number: QTBUG-32085 Change-Id: I31ae0dc9f0d09f3979797eb95eb87ed7bd181ae3 Reviewed-by: Oleg Shparber <trollixx@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Merge branch 'stable' into devAlex Blasche2014-05-081-3/+3
|\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/bluetooth/qbluetoothlocaldevice_bluez.cpp src/bluetooth/qbluetoothserver_p.h src/bluetooth/qbluetoothsocket_qnx.cpp Change-Id: I08792f10155f9b4e6af30066b70e24b48985ddd6
| * Fix a renamed qdoc tag and improve grammar/spellingAlex Blasche2014-04-251-2/+2
| | | | | | | | | | Change-Id: Iee11fdfe3b57fbe94d7e3362454851867d25e98a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Provide correct code snippet for QBluetoothServiceDiscoveryAgentOleg Shparber2014-04-221-1/+1
| | | | | | | | | | Change-Id: I8b975a2f55833c58479edac5d62809c1e83ea417 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix coding style in QBluetoothOleg Shparber2014-04-231-6/+7
|/ | | | | | | | Affected: QBluetooth, QBluetoothAddress, QBluetoothDeviceDiscoveryAgent, QBluetoothDeviceInfo, QBluetoothHostInfo, QBluetoothLocalDevice Change-Id: Ia5af61f87eafecfba56b75fa61b81014cdd38960 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Don't stop Bt discoveries while we have InvalidBluetoothAdapterErrorAlex Blasche2014-01-201-1/+1
| | | | | | | | | | | | | | This change complements 23a3863de809a4051ae6db4942145cb0cb624d6c. The discovery process should not stop when the passed local adapter address is invalid. While the first change ensures that start() cannot be called stop() was still callable. The platform specific implementations potentially set lastError to something else und thus would permit a call to start() later on. This may lead to invalid internal states. Change-Id: Ibfd87374bf712614fad90172894ea2e009ba198a Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Document a somewhat peculiar signal behavior mismatch during Bt discoveryAlex Blasche2014-01-151-0/+2
| | | | | Change-Id: I8f9ac85e7753a9d6142bbefcd0e4bcda09e0f3d8 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Improve and fix documentation for the Bluetooth discovery classes.Alex Blasche2013-12-201-6/+10
| | | | | | | | | [ChangeLog][QtBluetooth][Documentation] The documentation for the Bluetooth discovery classes has been improved. Change-Id: Id4366b491e8bbda8cf884b9ad3594dd89cc925e8 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Check the local adapter's BluetoothAdress before doing the discoveryFabian Bumberger2013-12-201-1/+16
| | | | | | | | Task-number: QTBUG-35571 Change-Id: I8f2eea7a8437787d61a238c760e948f45738618a Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Refactor device and service discovery errorsFabian Bumberger2013-09-201-2/+2
| | | | | | | | - Make them more consistent with other Qt modules - Propagate the error during device discovery to the QBluetoothServiceDiscoveryAgent Change-Id: Idcd3e0e6061b85e8b6adad248625740f3b91289a 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>
* Make Bluetooth adapter choosable for device and service searchNedim Hadzic2013-09-051-4/+4
| | | | | | | | | | | | | | | | | In case there are more Bluetooth adapter, device and service search might give different results. Addition to Change-Id: Ideddb39460985c18547baec986b15e43946c85de - added option for setting the device adapter for service search. QBluetoothLocalDevice was used in both classes (device and service search) for passing an argument for setting adapter. The reason for this to keep the same approach, because in QBluetoothServiceDiscoveryAgent class there is already a constructor with QBluetoothAddress argument. Auto tests and examples updated. Change-Id: Ib5d7ff23e4846d9d42dae68d8d424031748811e5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Make Bluetooth adapter choosable for device searchNedim Hadzic2013-08-291-1/+12
| | | | | | | | In case there are more Bluetooth adapter, device search might give different results. Change-Id: Ideddb39460985c18547baec986b15e43946c85de Reviewed-by: Alex Blasche <alexander.blasche@digia.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/+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>
* Qt Bluetooth: Modularized documentationJerome Pasion2012-09-271-1/+1
| | | | | | | | | | -moved documentation to src/bluetooth/doc -added a qdocconf file for Qt Bluetooth -fixed relative paths for snippets -moved examples to examples/bluetooth Change-Id: Id41bac50dca628400568d191f1c3ccfbaac790a1 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>
* Doc: add landing page for Qt Bluetooth moduleLeena Miettinen2012-08-311-1/+1
| | | | | | | | Move information from other topics to the landing page. Change-Id: I550dd1e4467e0ec8d60218f25d36e3fa12554488 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@nokia.com> Reviewed-by: Alex <ablasche@gmail.com>
* Replaced the deprecated \o qdoc command with \li, and added the missing ↵veshivas2012-04-241-3/+3
| | | | | | | \endlist command. Change-Id: I15aae722ffdeae7da38b421d59a509aa868f69aa Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Language edits to the QDoc markupVenugopal Shivashankar2012-02-291-22/+26
| | | | | 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-2/+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>
* 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 license headers.Jason McDonald2012-01-051-1/+1
| | | | | | Change-Id: I76920b22a5b386a0f85ec28076da20505c022b6f 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/+6
| | | | | | 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/+226
From qt5connectivity.tar.gz, md5 317c149d6f8c07d09632353188582834