summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QNX connected state fixv5.3.0-beta1Nedim Hadzic2014-03-181-0/+1
| | | | | | | | | In one case, when connecting to server, the state is not set to connected state, which makes impossible to write data to socket later. Change-Id: Iea4da3ffc162451963db2d0a7bc01fbafe4ebede Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Qt Bluetooth: Show correct names when compiling the moduleSze Howe Koh2014-03-181-2/+2
| | | | | Change-Id: I5f761cb428514d56fc88cd27def92defd3b83dd8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Doc: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-182-3/+9
| | | | | | | | | Append the handler names to the end of the corresponding signal doc. Task-number: QTBUG-35846 Change-Id: I0d1c067e9eca4c3c28489a074a7f0e33759c000a Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Ensure examples behave on default backend and/or with no local Bt deviceAlex Blasche2014-03-143-4/+19
| | | | | | | | | | 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>
* Convert internal function parameter to const &Alex Blasche2014-03-133-4/+7
| | | | | | | | Performance improvement Change-Id: I9565771ab6ed15dccc67d5d7e7d5c02759a40367 Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix a few TODOs around the source code and remove obsolete onesAlex Blasche2014-03-137-12/+15
| | | | | | Change-Id: I01e867cb5efb231e7c85b0d106897b2f31448977 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix code snippet error in docs and point out supported NFC platformsAlex Blasche2014-03-113-5/+27
| | | | | | | | | The code snippet was shifted into a compiled project to ensure continued compilation. Task-number: QTBUG-34978 Change-Id: I93f3b39442992bfb4049a44ed0dd6330d3ca9270 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Improve NFC documentationAlex Blasche2014-03-1113-78/+167
| | | | | | | | | | | | | 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>
* Android: Fix crashes due to concurrency issuesAlex Blasche2014-03-116-10/+33
| | | | | | | | | | | | | | | BroadcastReceiver.onReceive() is executed in the main thread whereas the Qt classes are in a different thread. This created issues whereby Java's qtObject pointer was reset by the Qt classes/thread but onReceive still trying to access the same object later on. In most cases the Qt classes using BroadcastReceiver were half way through their object tear down. This patch fixes the problem by guarding qtObject against concurrent thread access and ensures that the qtObject pointer is reset before the object tear down starts. Change-Id: Iab97b0af8e10686d97419ac8504f2fe69e9536f3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: Don't directly use java field valuesAlex Blasche2014-03-113-25/+44
| | | | | | | | | Action strings were previously converted. This patch fixes all non-action fields. Task-number: QTBUG-36810 Change-Id: I4011c619e900dcb4137c6552046f0342327a7288 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: Don't directly use the action string values but refer to the fields.Alex Blasche2014-03-118-57/+260
| | | | | | | | | | | | | This increases the robustness of the code since the field value is not an implementation detail. In addition we guard the action field lookup against fields which have been introduced later than the standard SDK version 10 supported by Qt. Task-number: QTBUG-36810 Change-Id: Ib6582e77202d40aaf116fe8dfa81562d89367ea2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Update .gitignore for qtconnectivity after several binary adds/removalsAlex Blasche2014-03-111-2/+6
| | | | | | Change-Id: Ie2e11e8c359d03785488a2ddd31f8b0f3a98340e Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Update QtBluetooth docs for Qt 5.3Alex Blasche2014-03-107-21/+36
| | | | | | | | | 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>
* Build the bluetooth doc snippet.Alex Blasche2014-03-106-58/+73
| | | | | | | | | | This ensures that it keeps compiling and is correct. Although it wasn't able to compile due to a partial implementation, the snippet itself had errors which demonstrated wrong API aspects. Change-Id: I24048d968573e260d5b3ba92e38ce1dc9d24e52f 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>
* Improve BtTestUI device and service discovery outputAlex Blasche2014-03-071-2/+13
| | | | | | | | This was recently used to debug Androids buggy discovery code. Change-Id: I6c3eca85a650d6fbb853d2cfc8ee73b434b5e7a9 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Android: Fix ommission of found services during SDP discoveryAlex Blasche2014-03-071-5/+5
| | | | | | | | | | | | serviceClassUuids were not correctly written and hence only ever one service was found per device. The deviceInfo and serviceUuid were the same anyway as we are talking about the same remote device and the absence of custom service uuids. Change-Id: I2d8dad2d38381b1c171afb236ee56822e62ffee3 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add missing Standard BT service/profile uuidsAlex Blasche2014-03-063-62/+93
| | | | | | | | | | | | 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-062-2/+2
| | | | | | | | 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>
* Remove insignificant flag from working unit test.Alex Blasche2014-03-041-1/+0
| | | | | | | | | This was missed during the earlier fixes to this test. Task-number: QTBUG-22017 Change-Id: Ica5bac09b565439bd65bfc42e9614544a21a0637 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix some typosSergio Ahumada2014-03-035-6/+6
| | | | | Change-Id: I37a1749cbb239211c2a3e2003f2f4057b840afd7 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Create QBluetoothServer unit test from QRfcommServer/QL2CAPServer testsAlex Blasche2014-03-0310-804/+16
| | | | | | | Task-number: QTBUG-22017 Change-Id: I3e5613153d2496567f7afd87c8a0a44c1067a4e7 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-037-16/+16
| | | | | | Change-Id: Idd8127e577be7381e170dab296d8f0564c478020 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix not working listen() on Bluez with default Bluetooth addressesAlex Blasche2014-03-031-1/+1
| | | | | | | | Binding to the address 0 does not work. Change-Id: Ie2e9bfc64729e6bf82556c3384d2e72117fc39ab Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix qrfcomm unit testAlex Blasche2014-03-016-208/+158
| | | | | | | | | | The patch also aligns the error behavior of QBluetoothServer::listen() across the various platforms. Task-number: QTBUG-22017 Change-Id: Ic81808c94d060ca07bd125afa842452e53efaec7 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Add dependencies to project file.Alex Blasche2014-02-281-2/+5
| | | | | | | CONFIG += ordered is inefficient and was replaced by proper dependencies. Change-Id: I7328ac428758d1719a2ae820a403d25b66de2ab4 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Normalize signal & slot signaturesAlex Blasche2014-02-272-3/+3
| | | | | | Change-Id: I81fd5cc89d88e4527778c6aed4cddeb0648dd812 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove btclientAlex Blasche2014-02-277-646/+0
| | | | | | | | | | It is replaced by bttestui which runs on any platform and is the official test tool for a variety of other tests too. Task-number: QTBUG-22017 Change-Id: Ia675876375901a0f19d1820e2167729aa863bd34 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix qbluetoothsocket unit testAlex Blasche2014-02-274-440/+174
| | | | | | | Task-number: QTBUG-22017 Change-Id: I876b8a052873d198e8991b7eab3ca70714eb0dcc Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix wrong error message.Alex Blasche2014-02-271-1/+1
| | | | | | Change-Id: I933d1f1e196b1009de6b33a2e603043d85d28b08 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix crash when interrupting QBluetoothSocket's input stream threadAlex Blasche2014-02-277-101/+253
| | | | | | | | | | | | The previous QThread did not always properly resume when InputStream.read() was interrupted by BluetoothSocket.close(). This patch converts the QThread to a Java thread which works as the Android API docs suggested. Task-number: QTBUG-37061 Change-Id: Id6ac9b57a28f3b532cbe49ff1dfdc9d1e6432aaa Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: Fix crash in QBluetoothServer::close()Alex Blasche2014-02-278-161/+302
| | | | | | | | | | | | | | Java's BluetoothSocketServer.accept() is meant to be interrupted via BluetoothSocketServer.close(). Unfortunately if the surrounding thread is a QThread the returning accept call crashes the thread. This does not happen if it is a Java Thread. This commit changes the server's private backend to a Java thread. Task-number: QTBUG-36754 Change-Id: I5aacc5444bbcd1275a11743b6aa04d2b11a5b22b Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Utilize new QBluetoothSocket::OperationError on QNX and BluezAlex Blasche2014-02-272-3/+33
| | | | | | | | Task-number: QTBUG-36817 Change-Id: I17f7d57537f7f1a5cedd01ce6043cfd6aac26db4 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add copy operator to QBluetoothHostInfo.Alex Blasche2014-02-273-0/+33
| | | | | | | | The QBluetoothSocket unit test was sometimes failing because of it. Change-Id: I6071902e1aaa9e1138f071b7f2ce2a8ccb436789 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove QBluetoothSocketPrivate::socketDescriptor()Alex Blasche2014-02-266-21/+1
| | | | | | | | | The function is not required as the public accessor function directly returns the socket descriptor. Change-Id: I6d64bec7b4f0542ce213dc90dcfe30c3885ed21d Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX Service registered value fixNedim Hadzic2014-02-262-5/+23
| | | | | | | | | | Once registerService() was called isRegistered() will always return true. A call to unregisterService() now resets the value. Cleaning fake server port hash. Task-number: QTBUG-36626 Change-Id: I452651266192e5773b8330e5f7c02885adff2279 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix crash when calling QBluetoothLocalDevice::connectedDevices()Alex Blasche2014-02-261-0/+3
| | | | | | | | The crash happened on Bluez while no local Bt device is connected. Change-Id: I418f73b964edc3c302665d4e3374b49a68cfdc46 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Max pending connection check for QNX server implementedNedim Hadzic2014-02-262-1/+3
| | | | | | | | Max pending connections was ignored when adding new connections. Change-Id: I96b1ae87254a772008b18a662faa7bc2bd84164b Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Revert "Bump latest Nfc QML API version to 5.4"Alex Blasche2014-02-262-5/+7
| | | | | | | | | This reverts commit 4bc3513f18fa6a7345708748590f6a1acda486dd THis should have gone to dev branch Change-Id: I231818b3ac31871072a7b4630e14659a7aea78c1 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* QNX QBluetoothSocket state fixNedim Hadzic2014-02-262-1/+4
| | | | | | | | Wrong socket state order fix. Due to this, the socket was not keeping remote device info. Change-Id: I860f15af9de4eb2e1238989d33bc59d62536f7aa Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Bump latest Nfc QML API version to 5.4v5.3.0-alpha1Alex Blasche2014-02-252-7/+5
| | | | | Change-Id: I1c4615c3d78985fbd410eafcee5a0a9ab72c8763 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* QNX pairing status fix implementedNedim Hadzic2014-02-211-3/+34
| | | | | | | Pairing status was returning Unpaired status even if device was paired. Change-Id: Ib529cc4868f8043f5d83076f96ac9d71acc7c96f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QBluetoothServer QNX closing error fixNedim Hadzic2014-02-211-10/+15
| | | | | | | | | | | In case socket was not defined error was emitted and it should not do anything when closing a socket. Resetting of d->activeSockets implemented. Task-number: QTBUG-36626 Change-Id: Id1f37c0019981ffb6d9b5fd00159c118d313f44c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Socket memory leak fix for QBluetoothServer QNXNedim Hadzic2014-02-211-3/+3
| | | | | | | | | | | listen(const QBluetoothAddress &address, quint16 port) was leaking memory if socket was not in listening state. This occurred when calling a method multiple times. Task-number: QTBUG-36626 Change-Id: I6a90f865d6c0e69d9f0b7acf0d200ec71910d448 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Don't refuse the connect attempt while in ServiceLookupState.Alex Blasche2014-02-201-1/+1
| | | | | | | | | QBluetoothSocket::connectToService can be called by itself when it does an SDP discovery. This affects Bluez only but the bug was introduced by the Android port. Change-Id: I1c9b0504acaafc7dbf2fc3d94b0c2c20a0cb8c65 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Don't assert when we discover a new SDP property.Alex Blasche2014-02-201-1/+0
| | | | | Change-Id: I4beb72aac294511b87ef95c459c52daa85c62499 Reviewed-by: Fabian Bumberger <fbumberger@rim.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>
* Add extensive test application for QtBluetoothAlex Blasche2014-02-159-0/+1285
| | | | | | | This application can be used to manually test most Bluetooth features. Change-Id: Ib7101ff2f5334026c67c2e00a852d6b10d4674e8 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into ↵Alex Blasche2014-02-154-5/+3
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'gerrit/stable' into devAlex Blasche2014-02-144-5/+3
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothserver.cpp src/bluetooth/qbluetoothserver.h Change-Id: Ia99c341ab6b4fb30d9ceb9e4516c7083eed1c547
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 01:20:31 +0000