summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Unify QBluetoothSoket, QBluetoothServer and QBluetoothServiceInfo protocol enumFabian Bumberger2013-09-2013-108/+80
| | | | | Change-Id: I6e66196a599e2cceabc7d93d728ba97361d8999f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Changing the way nfc target detection worksFabian Bumberger2013-09-1915-70/+33
| | | | | | | | | On Android and BB10 the target detection does not distinguish between NFC tag types when it comes to target detection but rather between the protocols the tags use. This patch removes the parameters used for target detection. Change-Id: I4609cde61d34159bc66b29a27f8d76df816e2c23 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Take socketType and serverType into accountFabian Bumberger2013-09-195-3/+39
| | | | | | | Also add a serverType member function in QBluetoothServer Change-Id: I107f73b3943dc84f5c4d2afcb00e303567a67b5d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add remote address property to QBluetoothDiscoveryModelFabian Bumberger2013-09-182-0/+31
| | | | | Change-Id: I979eaa15d62606206c4c175dcdcaf9d1691f4117 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Lower the verbosity of bluetoothFabian Bumberger2013-09-1812-44/+58
| | | | | | | | | Remove some qDebug statements and change qDebugs to qWarning in case of an error. Task-number: QTBUG-32253 Change-Id: Ia647d3f485cae56cc9f9c6725400f5b4617b7bf7 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* BlackBerry: Add some platform documentationFabian Bumberger2013-09-183-10/+19
| | | | | Change-Id: If2a8d289578f3bc7622cedd9faf35893880a2157 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Refactor QBluetoothDiscoveryModelFabian Bumberger2013-09-182-130/+268
| | | | | | | | | | | - Add the option to discover devices - Clear the model when a new discovery is started. In the previous implementation the model was only cleared if new data was available. This can lead to some funny results. - Change some property types to enums - Enhance the qmlscanner example Change-Id: I94f33e3eabd7440b5c0c6c83f3e8158009bd2dbd Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Cleanup Bluetooth project dependenciesAlex Blasche2013-09-171-1/+1
| | | | | | | | This removes unnecessary Qt dependencies. Change-Id: I0ae1fe711808f8e40aed5cc8b535bb5e1da58bff Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove qdeclarativebluetoothimageproviderFabian Bumberger2013-09-167-199/+1
| | | | | | | | This class in unfinished and does not work properly plus it introduces a dependency to the svg module. I also refactored the example where the icon was used. Change-Id: If3bd5e2eb6b05e090255f1bae0015d69c2a83065 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove LLCP from the public APIFabian Bumberger2013-09-1616-130/+153
| | | | | | | QLLCPServer does not work properly yet on BlackBerry so I would want to wait committing to this API till we have a backend that is working properly. Change-Id: I62cbe9dae00ed47377086e4c8522298b4c9fa5a4 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix qdoc warningsAlex Blasche2013-09-164-10/+5
| | | | | Change-Id: I5efbf42be944ee3dd0ba245b6ecaf752216d2b90 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Remove transactionDetected signalFabian Bumberger2013-09-112-12/+0
| | | | | | | Not used anywhere. Change-Id: I1b310addd84b3ab4308c33f296bc71e762d7d7e8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix qmake syntax errorAlex Blasche2013-09-111-1/+1
| | | | | | | | qtHaveModules doesn't exist and causes qml plugins not to build Change-Id: I028b9efd79d3cf551289772cecc561d1e52a5a12 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Clean up QBluetoothDeviceInfoFabian Bumberger2013-09-102-39/+11
| | | | | | | This patch removes "ManufacturerSpecificData" because it is not implemented and some dead code. Change-Id: I95a142280835addf65fbedd4a26f3266c7dc0838 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix compiler warningsAlex Blasche2013-09-101-1/+1
| | | | | | | Change-Id: I5d5eca4af0faa392defcec8ac50c7026eaeba2b1 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Remove QtBluetooth and QtNfc namespace.Alex Blasche2013-09-09149-323/+303
| | | | | | | | 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>
* Move qNfcChecksum() definition into a .cpp fileSze Howe Koh2013-09-094-72/+24
| | | | | | | | | | | The function is public; doesn't make sense to implement it in a private header. This patch also resolves the multiply-defined-symbols issue when trying to build some Qt NFC autotests without the "QtNfc" namespace. Change-Id: I4ba1dc31d93bb66454c7dcd043c18f81dc2ad680 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fix Doc warning in QtBluetoothAlex Blasche2013-09-051-1/+1
| | | | | | Change-Id: I24783920a815ee69eb28f0f37ab4c47af730826c Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Make Bluetooth adapter choosable for device and service searchNedim Hadzic2013-09-0512-42/+74
| | | | | | | | | | | | | | | | | 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>
* Merge QRfcommServer and QL2capServer to QBluetoothServerFabian Bumberger2013-08-2919-1147/+464
| | | | | | | Task-number: QTBUG-32722 Change-Id: Ia75ad5af2f81b737a8cca09dba919a7dc0fa0f8a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Don't build the qml/quick modules if Qt is built without QtQuickAlex Blasche2013-08-291-1/+2
| | | | | Change-Id: Ie6a8488a1e2a8ce25ed656a275e86df0006c751b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make Bluetooth adapter choosable for device searchNedim Hadzic2013-08-296-8/+32
| | | | | | | | In case there are more Bluetooth adapter, device search might give different results. Change-Id: Ideddb39460985c18547baec986b15e43946c85de Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Bugfixes for the service discovery agentFabian Bumberger2013-08-264-15/+36
| | | | | Change-Id: I8d977eb9013a9fa98427080baac1df881985d961 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Change name of platform define to QT_QNX_BLUETOOTHFabian Bumberger2013-08-238-21/+21
| | | | | | | To be aligned with the bluez implementation Change-Id: I8d3fbd0c23298f984e2c99cbf4131cf8fc0a0a64 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix segfault when deleting qrfcommserverFabian Bumberger2013-08-232-4/+12
| | | | | Change-Id: Iefb851c818303c5f8fe2ef783ccfee5d13bcf827 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix compilationFabian Bumberger2013-08-233-31/+46
| | | | | | Change-Id: I075b0d43867c844af05ba8ca86c237b023738da2 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add copy constructor to QNdefNfcSmartPosterRecord to avoid compile errorAlex Blasche2013-08-132-0/+9
| | | | | | Change-Id: I133e7f09780d8da3bb88e9971a7f858b905176b4 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Extend and improve the unit test for QBluetoothServiceInfoAlex Blasche2013-08-123-57/+33
| | | | | | | | | | | | | | Note that this change causes a behavior change. If a service object is a copy of antoher one they both share the same data and behavior. Changing one will affect the copy in the same way. No automatic detach will happen. THis is a much more expected behavior and avoids issues where one service info copy was not able to deregister the service anymore. Change-Id: I0b10688a5ef55e8c1dd9f5ccbf090336e3f635ad Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Improve QBluetoothTransferManager unit testAlex Blasche2013-08-097-16/+14
| | | | | | | | | and fix some minor issues during the process. Task-number: QTBUG-22017 Change-Id: Iff1adde28ba818c3ed0511cb5d45404f05d7c36f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Make the device discovery agent more robustFabian Bumberger2013-08-083-72/+134
| | | | | | | Also fixes the autotests. Change-Id: I71983fa3cc49a88bb7b94544b7f24bebbd3cf86e Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Only send radio_init message when Bluetooth is really powered offFabian Bumberger2013-08-071-1/+2
| | | | | Change-Id: I05b8f14c8b65529eb0502b90d8949ed2a9a8b031 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Close the BT control FD with a delayFabian Bumberger2013-08-072-10/+22
| | | | | | | | Otherwise messages might not be passed to the BT service correctly. Change-Id: I3ff26caa853283b09a995806631fdc82ac851e6f Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Change default value for inquiry type in QBluetoothDeviceDiscoveryAgentFabian Bumberger2013-08-071-0/+1
| | | | | Change-Id: I46b780875ec8ae7bfd0aeda89b6271a1fa0b30b1 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Clarify the docs for QBluetoothLocalDevice(QBluetoothAddress(),0)Alex Blasche2013-08-071-1/+2
| | | | | | Change-Id: I2bdde67f1f0f6b71190d71b5559bbd88bb2db155 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Use default adapter for default constructed BT addressFabian Bumberger2013-08-061-1/+2
| | | | | Change-Id: I738d77861199ab3ff27f989936daf50c4b2a8202 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Emiting HostPoweredOff when BT is shut downFabian Bumberger2013-08-061-0/+5
| | | | | Change-Id: I14d01fb7ec6795a31ac9f239d34f3f02fd0880b5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* The QBluetoothDeviceDiscoveryAgent test is not longer insignificantAlex Blasche2013-08-061-0/+1
| | | | | | | Task-number: QTBUG-22017 Change-Id: I83f1d88ddd6255693f4aa8a2993cd1a818981a75 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Emit pairing finished signalFabian Bumberger2013-08-066-15/+74
| | | | | | | | | | Pairing finished signal is emitted after pairing was requested. Also fixes a typo and a bug where the q Pointer was not saved. Task-number: QTBUG-32247 Change-Id: Ia2d32fdafd9510908f278edda927071199326f5d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Improve btfiletransfer applicationAlex Blasche2013-08-063-14/+30
| | | | | | | | This improves the general error response while doing OPP. Change-Id: I28fd68bfb5d6eae83ec6422c723acf98abc3abdd Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-022-0/+2
| | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: I13d0a179dbea663a85fe9b175bf6770fe673d732 Reviewed-by: Martin Smith <martin.smith@digia.com>
* QNX: Fix Compilation error and compiler warningsFabian Bumberger2013-08-011-5/+5
| | | | | Change-Id: I45df1d1e4a4ce42ee7eb1c7c566e6d7a9aeb8ec2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Adding a convenience function for registering an SPP serverFabian Bumberger2013-08-013-1/+56
| | | | | Change-Id: Ieef40295b3fb5a6b16f3cf8b9c75a9306c161025 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX Bluetooth adding OPPFabian Bumberger2013-08-016-1/+409
| | | | | | | Makes it possible to send QFiles over OPP. Other QIODevices do not work yet. Change-Id: I3a85a1f4a95c9059143f20d01c20ac27961e4a09 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Clean up for OPPFabian Bumberger2013-08-019-116/+42
| | | | | | | | | | | - Remove Operation enum, because we only support put requests - Add the request to the transfer reply - Move startOPP to the private area Task-number: QTBUG-32726 Change-Id: If7dae547326cb74dcdd6449c08dc0d91fb8a78b2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix compiler warningsFabian Bumberger2013-07-317-16/+19
| | | | | Change-Id: Ia73b3a89464d5913bec4cc528047283475297083 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix bluetooth device discovery testAlex Blasche2013-07-311-0/+5
| | | | | | | | The Bluez and Generic backends were failing. Change-Id: Id4a55a43432a9ad198d36062a1e4e23a54b658ec Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fix compiler warningAlex Blasche2013-07-301-1/+1
| | | | | | | | | | | | | qbluetoothserviceinfo_bluez.cpp:87:5: warning: case value ‘33’ not in enumerated type ‘QVariant::Type’ [-Wswitch] qbluetoothserviceinfo_bluez.cpp:81:5: warning: case value ‘34’ not in enumerated type ‘QVariant::Type’ [-Wswitch] qbluetoothserviceinfo_bluez.cpp:67:5: warning: case value ‘36’ not in enumerated type ‘QVariant::Type’ [-Wswitch] qbluetoothserviceinfo_bluez.cpp:60:5: warning: case value ‘37’ not in enumerated type ‘QVariant::Type’ [-Wswitch] qbluetoothserviceinfo_bluez.cpp:57:5: warning: case value ‘43’ not in enumerated type ‘QVariant::Type’ [-Wswitch] Change-Id: Ic5e792119e0676e09e1f4a3b07e5d3defa27c623 Reviewed-by: Michael Zanetti <michael.zanetti@canonical.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex <alexander.blasche@digia.com>
* Use the getter instead of accessing the value directlyThomas McGuire2013-07-302-1/+6
| | | | | | | | | This fixes a valgrind issue with the dummy backend and sdds the getter to the Bluez backernd. Change-Id: I55c785e01bb428819b8ae9a936b761c3697ecb50 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Alex <alexander.blasche@digia.com>
* Removing QRfcommSocket and QL2capSocketFabian Bumberger2013-07-305-246/+0
| | | | | | | The symbols of these classes are not exported and they are not needed anywhere. Change-Id: Ie668d0b26e7df29c31fb471f0c4f6e9beae90a9b Reviewed-by: Alex <alexander.blasche@digia.com>
* BlueZ: Fix setting host modeFabian Bumberger2013-07-302-7/+34
| | | | | Change-Id: Id36f047acfaabf3fdbb4e6c07e88dac50878a641 Reviewed-by: Alex <alexander.blasche@digia.com>