Commit Graph

18 Commits

Author SHA1 Message Date
Alex Blasche c9af4c90ee Add preferredSecurityFlags to QBluetoothSocket
This permits the API user to determine the security parameters for the
connect attempt to the remote SPP service.

Task-number: QTBUG-46377
Change-Id: I1ed5ea0f5a32aa08dcedc46a34b0377654e420b2
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
2015-07-03 15:14:26 +00:00
Jani Heikkinen 7354c6d393 Update copyright headers
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>
2015-02-16 11:48:42 +00:00
Alex Blasche d02f13307f Make QBluetoothSocket's _q_writeNotify & _q_readNotify private
These two functions are really only needed by Linux style socket code.
There is no need for other platforms to implement them as dummy too.
It simplifies the code somewhat.

Change-Id: I3e0aced8d9f7b590d1c6aaa60f97bd060ee8f4b4
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
2014-08-25 15:03:10 +02:00
Jani Heikkinen ac0b7ac671 Update license headers and add new licenses
- 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>
2014-08-24 17:23:37 +02:00
Alex Blasche 61f2f050a7 Fix a few TODOs around the source code and remove obsolete ones
Change-Id: I01e867cb5efb231e7c85b0d106897b2f31448977
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-03-13 08:35:32 +01:00
Alex Blasche 10e636b4e5 Fix qbluetoothsocket unit test
Task-number: QTBUG-22017
Change-Id: I876b8a052873d198e8991b7eab3ca70714eb0dcc
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-02-27 16:14:01 +01:00
Alex Blasche f58cddd97a Remove QBluetoothSocketPrivate::socketDescriptor()
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>
2014-02-26 17:31:15 +01:00
Fabian Bumberger ec83763323 Unify QBluetoothSoket, QBluetoothServer and QBluetoothServiceInfo protocol enum
Change-Id: I6e66196a599e2cceabc7d93d728ba97361d8999f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2013-09-20 10:09:12 +02:00
Alex Blasche e21b666856 Remove QtBluetooth and QtNfc namespace.
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>
2013-09-09 12:44:29 +02:00
Alex Blasche 8dad4698d9 Update Copyright headers
- 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>
2013-06-25 10:08:54 +02:00
Aaron McCarthy 1002efbb0c Rename NFC and Bluetooth namespace macros.
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>
2013-02-14 13:26:02 +01:00
Iikka Eklund 0521eb5e1b Change copyrights from Nokia to Digia
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>
2012-09-23 08:13:05 +02:00
Toby Tomkins 86484ab3e2 Remove unused parameter warning from build.
Change-Id: Ic841719633dbc5ec3409e60d81c77310a7c06c38
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
2012-08-01 05:14:05 +02:00
Jason McDonald 78d225a563 Remove "All rights reserved" line from license headers.
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>
2012-01-30 07:07:47 +01:00
Jason McDonald f54bd71301 Update obsolete contact address.
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>
2012-01-20 08:03:44 +01:00
Jason McDonald 554a19264b Update copyright year in Nokia copyright headers.
Update copyright headers from before 2011.

Change-Id: Ic34da6aa9bf8ba63d4e41c2135b4fdaf7c437360
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-11 04:20:22 +01:00
Michael Zanetti f0daca9ff8 added Connectivity namespaces (QtBluetooth and QtNfc)
Change-Id: I5f3062c857e657a6d05ab29edfa2f1b48cb173f8
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
2011-11-11 07:35:00 +01:00
Michael Zanetti 29ba829744 Initial commit.
From qt5connectivity.tar.gz, md5 317c149d6f8c07d09632353188582834
2011-08-24 14:10:36 +10:00