summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Make lowenergyscanner example compile after recent API changesAlex Blasche2014-06-111-1/+1
| | | | | | | The handle of a characteristic is not longer a string but a number. Change-Id: Ic580ec8e365076704192a466cca9a6bf06786f58 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* QBluetoothDeviceInfo::coreConfiguration() should return the QFlagAlex Blasche2014-06-042-2/+2
| | | | | | | | | 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>
* Rename permission related API in QLowEnergyCharacteristicInfoAlex Blasche2014-06-041-1/+1
| | | | | | | | | | | | | | 1.) Rename QLowEnergyCharacteristicInfo::Property to QLowEnergyCharacteristicInfo::PropertyType 2.) Rename permissions() to properties() 3.) Return PropertyTypes as return value for permissions()/properties() Change-Id: I5c4037876047354fd691cadc54d3ac6098db4522 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Merge branch 'dev' into btleAlex Blasche2014-05-2652-2639/+1310
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Utilize QStringLiteral where possibleAlex Blasche2014-05-155-21/+21
| | | | | | | | | | | | | | | | The only exception are generated files and cases where QLatin1String based overloads are used (e.g. during QString comparisons) Change-Id: I6f36789fb8acb3b30c1dc1f8a920b118a979d74f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Merge branch 'stable' into devAlex Blasche2014-05-0811-37/+87
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/bluetooth/qbluetoothlocaldevice_bluez.cpp src/bluetooth/qbluetoothserver_p.h src/bluetooth/qbluetoothsocket_qnx.cpp Change-Id: I08792f10155f9b4e6af30066b70e24b48985ddd6
| | * Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-2310-36/+86
| | |\ | | | | | | | | | | | | Change-Id: Ic86710cdf2550f5cf70c81af3f351d6712cd1b0e
| | | * Doc: Improved example documentationJerome Pasion2014-04-1410-36/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -include a section about running the example (from qtbase/doc/global) -added links to Qt Bluetooth or Qt NFC -updated copyright year -added markup to a string and other small corrections -added \brief Task-number: QTBUG-33597 Change-Id: Ia65821549a0e2e3fbf164188982114b4741be233 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
| | * | Use extended SDP discovery in btchat example.Alex Blasche2014-04-141-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android's minimal service discovery is very limited and more often than not fails entirely. Using FulklDiscovery dramatically increases the chance to find the remote SPP chat server. Task-number: QTBUG-38140 Change-Id: I1df55f74a6896312236ef06485c4063c9e893e6c Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * / Replace all occurrences of Q_EMIT with emitOleg Shparber2014-04-292-13/+13
| |/ | | | | | | | | Change-Id: Ieec72048837abe70b0187086b265bcde96c7d6cd Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Remove old Bluetooth tennis exampleAlex Blasche2014-04-0222-2579/+1
| | | | | | | | | | | | | | | | And update the documentation around the removal. The new ping pong game example is written in QML and much easier to maintain. Change-Id: I885d0c82b8f6eb8935c8f030ebb0adef9c1afc85 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * QML PingPong example addedNedim Hadzic2014-04-0213-1/+1186
| | | | | | | | | | | | | | | | | | Example presents the socket communication between two Bluetooth devices. The basic concept is the ping pong game, where coordinate updates of the ball and pedals are sent via socket. Change-Id: I61d8eb0baaa11c1485a923bb0a6ae6b89cd0e6a9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Ensure examples behave on default backend and/or with no local Bt deviceAlex Blasche2014-03-142-3/+16
| | | | | | | | | | | | | | | | | | | | This patch fixes crashes and ensures that examples give some form of indication why they are not working. Change-Id: Id99951e8729c0715505e5fff7448a475979a6406 Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Added and improved error handling in controller classNedim Hadzic2014-03-255-15/+17
| | | | | | | | | | | | | | Error enums added and implemented together with examples. Change-Id: I912c396080ee9a6b87f41104eb7e41f8c62abf8b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Cleanup of BtLE codeAlex Blasche2014-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | 1.) Remove dead pieces of code 2.) Fix warnings 3.) Optimize some code lines Change-Id: I952fe34e8966a501a54c9ef42e9624c1fc46a2a1 Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge branch 'dev' into btleAlex Blasche2014-03-1416-28/+71
|\| | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothuuid.cpp tests/bttestui/btlocaldevice.cpp Change-Id: Id16ab93ec61361950669da7eb232769c5dc4644f
| * Improve NFC documentationAlex Blasche2014-03-113-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | 1.) Extend the NFC overview page 2.) Ensure that snippets are compiled at all times 3.) Mark Qt 5.3 APIs using \since Task-number: QTBUG-32401 Task-number: QTBUG-34978 Change-Id: I8928be3d7dd2c9de1314eb1ec6ed55c8d4301f4a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Update QtBluetooth docs for Qt 5.3Alex Blasche2014-03-103-5/+10
| | | | | | | | | | | | | | | | | | This fixes some spelling/grammar mistakes and updates information that has changed in Qt 5.3 Change-Id: I09d1ea1dc3edef08c3ee6a494968e13e91385c29 Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Add screenshots and description to the QML scanner example.Alex Blasche2014-03-103-1/+21
| | | | | | | | | | | | Change-Id: I06c42105a8a64f41fc841958f7cd33b544b1fcae Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-034-9/+9
| | | | | | | | | | | | Change-Id: Idd8127e577be7381e170dab296d8f0564c478020 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * the poster example needs no widgets, but it needs quickOswald Buddenhagen2014-02-203-4/+7
| | | | | | | | | | | | | | Task-number: QTBUG-36893 Change-Id: Ic77fe07aa450001386be0b2e0d4a99f2e674dbb2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* | BLE scanner search bar fixNedim Hadzic2014-03-103-4/+17
| | | | | | | | | | | | | | | | During device scan, search bar was gone after device is added and device scan was not yet done. Change-Id: I39bd7fc1c3f8c22a93921313d818ba1cd00363a0 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix 16 bit mode for heart rate measurementAlex Blasche2014-03-062-25/+23
| | | | | | | | | | | | | | | | | | At the same time the code has been streamlined to enhace its visual clarity (the section is directly used in the documentation) Change-Id: I9a126c6f7b412fc0918d45d308540651cb105f0e Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Lowenergyscanner example improvedNedim Hadzic2014-02-2712-57/+82
| | | | | | | | | | | | | | Error handling improved, code styling improved. Change-Id: I1f35c6a6ef9641cb445fdbe55e0127b554e50ebc Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Renaming QLowEnergyServiceInfo methodsNedim Hadzic2014-02-214-11/+13
| | | | | | | | | | | | | | | | | | Ensures that QLowEnergyServiceInfo and QBluetoothServiceInfo are more alike. Tests and examples updated as well. Change-Id: I0f6a97900891a9673f99578bdc8d156a8c403513 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Heart Listener example addedNedim Hadzic2014-02-2125-1/+1821
| | | | | | | | | | | | | | | | | | | | | | Bluetooth Low Energy example for connecting and receiving measurements from the heart belt. Documentation added too. [ChangeLog][QtBluetooth] Heart Listener Bluetooth Low Energy heart belt example has been added Change-Id: I1b690827af85411c962eb09aa87936f1fb7d9246 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Show characteristic values with proper encoding in LEscanner exampleAlex Blasche2014-02-202-4/+6
| | | | | | | | | | | | Change-Id: I7f5fceae5d47e62d9b26fbced0cf73abe8d18d23 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix incorrect license header.Alex Blasche2014-02-201-1/+1
| | | | | | | | | | | | Change-Id: If58d69ea4afb6418d60b3e0b6e9fef10ae09c055 Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge branch 'dev' into btleAlex Blasche2014-02-1742-14/+1248
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * Misc fixes for the new corkboard exampleAlex Blasche2014-02-036-13/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The example was hooked into the build system. - The display location of notes on the display was optimized to reduce overlapping with the bottom and right corner. - A documentation page was added for the example. - example binary added to git ignore list - Fix license headers Change-Id: Ib18433c2a7dd68a3573c62ff3215fa0e69954f95 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Add the nfc corkboard exampleFabian Bumberger2014-02-0311-0/+353
| | | | | | | | | | | | | | | | [ChangeLog][QtNfc][General] Added a new corkboard example displaying the content of NDEF text records. Change-Id: Ic60ef8a67abaf45b5f34378e822f3d89ca7e26a2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Adjust qml scanner example to high dpi displayAlex Blasche2014-01-292-9/+19
| | | | | | | | | | | | | | | | | | | | [ChangeLog][QtBluetooth][General] QML scanner example has been optimized for high DPI displays. This ensures a better user interface for Android and Blackberry devices. Change-Id: If757cd9faddc155cbb4bb034885662abc84fc7a6 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Add documentation for picture transfer example and minor QML fixesAlex Blasche2014-01-2817-22/+135
| | | | | | | | | | | | Change-Id: I8ef9e19de9f48797034fd186dff4b0e096748b1d Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Adding a qml OPP example for sending picturesFabian Bumberger2014-01-2812-0/+676
| | | | | | | | | | | | | | | | [ChangeLog][QtBluetooth][General] Added a new Object-Push example. Change-Id: I78988771259dd9c7b65080bb7fb9828f6f55ece4 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-171-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7295292bb7d9b5fc7eba8f099f4592b70de80d11
| | * Don't build scanner example without QtQuickAlex Blasche2014-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-35711 Change-Id: I0406fb5edd8fb2a90046308853485eaaa4311a26 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Print error message in Bluetooth QML scanner example.Alex Blasche2014-01-151-0/+12
| |/ | | | | | | | | | | | | | | It required 15 min debugging the not working application till it was discovered that the Bluetooth device was not turned on. Change-Id: I05318c78dd4f19780d0b6343a4ae781703c18d91 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * Use QLoggingCategory to categorize the various debug output streamsAlex Blasche2013-12-201-0/+2
| | | | | | | | | | | | | | Task-number: QTBUG-32253 Change-Id: I193162407d0fc7eca83689e31f03e1641a494ab0 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Fix make install rules to all examples in QtConnectivity repoAlex Blasche2013-11-288-3/+27
| | | | | | | | | | | | | | | | | | This was highlighted during the testing of the Qt 5.2.0 package. Change-Id: I94b27f02a6621bccb9f0ce0d0cc184a449014573 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Implemented Bluetooth Low Energy: examples documentationNedim Hadzic2014-01-143-0/+40
| | | | | | | | | | | | | | | | Added documentation for lowenergyscanner example together with two screenshots. Change-Id: I3615ffee26edd5b2ce75e93adc940ba9d272f072 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Implemented Bluetooth Low Energy: examplesNedim Hadzic2014-01-0919-1/+1506
| | | | | | | | | | | | | | | | | | Examples which illustrate how to use BLE API are implemented. First example is an application for discovering LE devices, services and characteristics. Change-Id: Ic144c78499b74934541837df9a53183b4e7e32f7 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Implemented Bluetooth Low Energy gatt service and characteristics discoveryNedim Hadzic2013-11-043-0/+18
|/ | | | | | | | | 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>
* Doc: language and style review doc qtconnectivityNico Vertriest2013-10-143-45/+45
| | | | | | | | Reviewed doc Bluetooth and NFC Task-number: QTBUG-32173 Change-Id: I80f81c2123c3ee4fc269f471123f332dc39ee958 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QtNfc QML Api starts with version 5.2Alex Blasche2013-10-141-1/+1
| | | | | | | | 5.0 remains silent version Change-Id: Id1665120f8e694b21b59168db5f1168a7d3ce1d6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* QtBluetooth QML API starts with 5.2.Alex Blasche2013-10-141-1/+1
| | | | | | | | 5.0 remains as silent import though. Change-Id: I06c839a1224dc0d8b019bd99e354245f829ae750 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* BluetoothDiscoveryModel API fixesAlex Blasche2013-10-111-2/+5
| | | | | | | | | | | | | - rename signal: newServiceDiscovered -> serviceDiscovered - rename signal: newDeviceDiscovered -> deviceDisovered - add parameter to deviceDiscovered signal - improve documentation for above signals - minor example fixes Task-number: QTBUG-33678 Change-Id: I2f9223250ef844564c3e76a85adc25322867fd6e Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Change the service properties in btchat exampleFabian Bumberger2013-10-011-2/+7
| | | | | | | And adding some links to the documentation. Change-Id: I7f9baf6a648547ef028f9521b0d88b88267fa301 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Alter the way type and TNF are treated in the qml APIFabian Bumberger2013-09-301-2/+2
| | | | | Change-Id: Iff972e1645447a57eb72e3006318a9dd5b2d5c9b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Emit service discovery error during internal device discoveryAlex Blasche2013-09-251-1/+2
| | | | | | | | | This was discovered when starting a service discovery while no Bluetooth device is connected. Change-Id: Ibb970ee6cb95ff50bca635813cce23c4d7f8e3c6 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix peer to peer communication using two local adapters.Alex Blasche2013-09-258-25/+95
| | | | | | | | | | | | The code assumed to use the default adapter in a variety of places which caused wrong SDP registrations, device searches and peer names. The btchat examples was extended to cope with two local adapters. If there are more than two local adapters they will be ignored. Change-Id: I27d8bce65d943773e4e6cbd86982446fa79664a4 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>