qt:qtconnectivity.git
4 years agoBuild Bluetooth and NFC only for Blackberry
Andreas Holzammer [Thu, 31 Oct 2013 13:26:56 +0000 (14:26 +0100)]
Build Bluetooth and NFC only for Blackberry

Plain QNX does not need to have Bluetooth and/or
NFC.

Change-Id: I6323d03292a2b72d21f8d947bb58205648cb0061
Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agouse private linkage where possible
Oswald Buddenhagen [Thu, 31 Oct 2013 12:51:40 +0000 (13:51 +0100)]
use private linkage where possible

Change-Id: I14e289bd44ab31fff081d5d63974e524232313a8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
4 years agoDoc: Fix module name format v5.2.0-beta1
Sze Howe Koh [Mon, 14 Oct 2013 12:01:14 +0000 (20:01 +0800)]
Doc: Fix module name format

Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

Task-number: QTBUG-33360
Change-Id: I51f23e4b3ac0dffe8fef674f2cb431776d5829ab
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years agoRemove not needed error enum and avoid future enum value collisions
Alex Blasche [Tue, 15 Oct 2013 11:19:17 +0000 (13:19 +0200)]
Remove not needed error enum and avoid future enum value collisions

Change-Id: Ieb40958b689914db3b9b5303757426d7348d3fbe
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoUpdate Bluetooth QML meta data for Qt Creator
Alex Blasche [Fri, 11 Oct 2013 12:51:28 +0000 (14:51 +0200)]
Update Bluetooth QML meta data for Qt Creator

Change-Id: I50ae4f34e1d737c59ff0e15e940e0e6484412271
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoDoc: language and style review doc qtconnectivity
Nico Vertriest [Tue, 1 Oct 2013 11:51:33 +0000 (13:51 +0200)]
Doc: language and style review doc qtconnectivity

Reviewed doc Bluetooth and NFC

Task-number: QTBUG-32173
Change-Id: I80f81c2123c3ee4fc269f471123f332dc39ee958
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years agoUse recommended way of using \brief statements in QML Types.
Alex Blasche [Fri, 11 Oct 2013 13:37:12 +0000 (15:37 +0200)]
Use recommended way of using \brief statements in QML Types.

Change-Id: Id8f57b69dcb80056b53bfee538a2f65c9662bb55
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
4 years agoUpdate Nfc QML meta data for Qt Creator
Alex Blasche [Fri, 11 Oct 2013 13:26:08 +0000 (15:26 +0200)]
Update Nfc QML meta data for Qt Creator

Change-Id: Ibb2651b948bf39e9a56a5351d5c69d5848c7a7bd
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQtNfc QML Api starts with version 5.2
Alex Blasche [Fri, 11 Oct 2013 13:23:15 +0000 (15:23 +0200)]
QtNfc QML Api starts with version 5.2

5.0 remains silent version

Change-Id: Id1665120f8e694b21b59168db5f1168a7d3ce1d6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
4 years agoQtBluetooth QML API starts with 5.2.
Alex Blasche [Fri, 11 Oct 2013 12:48:42 +0000 (14:48 +0200)]
QtBluetooth QML API starts with 5.2.

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>
4 years agoSimplify QBluetoothTransferManager autotest
Fabian Bumberger [Thu, 10 Oct 2013 15:22:00 +0000 (17:22 +0200)]
Simplify QBluetoothTransferManager autotest

I don't think the service discovery in there does anything valuable.
Basically every device has a OPP service running.
Like this it is just time consuming and error-prone.

It would also be good to have a tool that automatically accepts the transfer on the testserver so that we can actually execute the test automatically.

Change-Id: I93b3bab32cecb8a3005cecb95a69a40813663e4d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFix unit test error in qndefrecord.
Alex Blasche [Thu, 10 Oct 2013 08:35:40 +0000 (10:35 +0200)]
Fix unit test error in qndefrecord.

The typenameformat signal was not always emitted due to insufficient logic
associated with first time initialization of QQmlNdefRecord. This error
only happened when the compiler didn't initialize
QNdefRecordPrivate::typeNameFormat to 0.

Change-Id: Ieba0a1d7c940c40980ff455ca5c1665c298c0527
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoUpdate QML type description for Bluetooth QML API due to API changes.
Alex Blasche [Thu, 10 Oct 2013 11:55:28 +0000 (13:55 +0200)]
Update QML type description for Bluetooth QML API due to API changes.

Change-Id: I30ae8567823e9d48a51654f18048bf66babc6e5a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
4 years agoDocument the data roles offered by the BluetoothDiscoveryModel.
Alex Blasche [Thu, 10 Oct 2013 11:53:04 +0000 (13:53 +0200)]
Document the data roles offered by the BluetoothDiscoveryModel.

Change-Id: Ifba68d1980f6eedd030db38836be5a2d62a224b2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
4 years agoBluetoothDiscoveryModel API fixes
Alex Blasche [Thu, 10 Oct 2013 11:38:14 +0000 (13:38 +0200)]
BluetoothDiscoveryModel API fixes

- 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>
4 years agoRemove the "registerNdefMessageHandler" template function and doc fixes
Alex Blasche [Thu, 10 Oct 2013 13:17:47 +0000 (15:17 +0200)]
Remove the "registerNdefMessageHandler" template function and doc fixes

Too much syntactic sugar and qdoc has problems recognising it as well.

Change-Id: I99f482426f537a8d3c0099edc3c393676424afec
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoImprove handling of invalid Bt address by QBluetoothTransferManager
Alex Blasche [Thu, 10 Oct 2013 10:09:55 +0000 (12:09 +0200)]
Improve handling of invalid Bt address by QBluetoothTransferManager

Some minor unit test improvements

Task-number: QTBUG-33801
Change-Id: Idc98bf8928ced0f9e01b24668edf7c32172d2fd1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoMake the QBluetoothTransferRequest constructor explicit
Fabian Bumberger [Thu, 10 Oct 2013 18:03:49 +0000 (20:03 +0200)]
Make the QBluetoothTransferRequest constructor explicit

Change-Id: I973ffedf6dc0c5b7215c9e99f5fb4bcb96ea6084
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFix Bluetooth doc errors.
Alex Blasche [Thu, 10 Oct 2013 10:25:55 +0000 (12:25 +0200)]
Fix Bluetooth doc errors.

Change-Id: I2ed67e0989eb8fe2c2c63def2654c6db2805c94a
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFix MSVC64-warning about truncation from size_t to int.
Friedemann Kleint [Thu, 10 Oct 2013 08:21:48 +0000 (10:21 +0200)]
Fix MSVC64-warning about truncation from size_t to int.

Change-Id: I592a6bf4396ff2fc587527fe4faf1093d9ea4f57
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agosync.profile: Remove dependency on qtsystems#dev
Sergio Ahumada [Tue, 8 Oct 2013 18:15:08 +0000 (20:15 +0200)]
sync.profile: Remove dependency on qtsystems#dev

Change-Id: Ice4b9d2bf163aab7ac4d17387e11cf09b2a68790
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQNX: Fix update progress
Fabian Bumberger [Mon, 7 Oct 2013 20:59:24 +0000 (22:59 +0200)]
QNX: Fix update progress

The string format can only be converted to a double for very high numbers.

Change-Id: I20e284eb24761dcb11a4777baf37782752b95bb6
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFix QDeclarativeBluetoothSocket stringData property
Alex Blasche [Wed, 25 Sep 2013 16:15:33 +0000 (18:15 +0200)]
Fix QDeclarativeBluetoothSocket stringData property

Task-number: QTBUG-31729

Change-Id: Idd820e57b72c2293c999bdc0a578d1e8f8e5471b
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoRename QDeclarativeNdefRecord -> QQmlNdefRecord
Sze Howe Koh [Fri, 4 Oct 2013 13:53:07 +0000 (21:53 +0800)]
Rename QDeclarativeNdefRecord -> QQmlNdefRecord

The QDeclarative* class prefix is associated with the now-deprecated
Qt Declarative module (a.k.a. Qt Quick 1). In Qt Quick 2, all
QDeclarative* classes have been renamed to QQml* or QQuick*

Also rename the example, QDeclarativeNdefFooRecord -> QQmlNdefFooRecord

Change-Id: Ie81a9ea2fdda145ad749afb07ef758f791b278d0
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoChange the service properties in btchat example
Fabian Bumberger [Tue, 1 Oct 2013 12:20:26 +0000 (14:20 +0200)]
Change the service properties in btchat example

And adding some links to the documentation.

Change-Id: I7f9baf6a648547ef028f9521b0d88b88267fa301
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQNX: Fix socket connection with a service info object
Fabian Bumberger [Mon, 30 Sep 2013 16:28:45 +0000 (18:28 +0200)]
QNX: Fix socket connection with a service info object

Change-Id: Ib33787c849ba4370bb9e99a6cc50ce30ce216f0c
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQNX: Fix uuid filter in service discovery
Fabian Bumberger [Mon, 30 Sep 2013 14:25:27 +0000 (16:25 +0200)]
QNX: Fix uuid filter in service discovery

Change-Id: I5493be50f66cf8df8fac1177b885c395a6d697b6
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoDon't throw an error when a low energy device is discovered
Fabian Bumberger [Mon, 30 Sep 2013 14:24:18 +0000 (16:24 +0200)]
Don't throw an error when a low energy device is discovered

Just ignore it

Change-Id: I7d8139f8c10cee0df4e2ebdc13bb76ee6bb8dda3
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQML Near Field: Allow detecting NDEF messages without setting a filter
Fabian Bumberger [Mon, 30 Sep 2013 10:24:34 +0000 (12:24 +0200)]
QML Near Field: Allow detecting NDEF messages without setting a filter

Change-Id: Ifb85ddb23df8e5302aac1b70b893f71e0fe8462d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoAlter the way type and TNF are treated in the qml API
Fabian Bumberger [Wed, 25 Sep 2013 16:07:20 +0000 (18:07 +0200)]
Alter the way type and TNF are treated in the qml API

Change-Id: Iff972e1645447a57eb72e3006318a9dd5b2d5c9b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoRefactor QDeclarativeBluetoothServiceInfo
Fabian Bumberger [Fri, 27 Sep 2013 16:17:59 +0000 (18:17 +0200)]
Refactor QDeclarativeBluetoothServiceInfo

Change-Id: I8a8197a5e10ee0d087dea2b55eb9577ba8c7d3c9
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoUpdate the git-archive export options
Sergio Ahumada [Fri, 27 Sep 2013 14:23:41 +0000 (16:23 +0200)]
Update the git-archive export options

The .gitattributes, .gitignore, .commit-template files do not need to be
present in packaged sources, as they are for people using the Git
repository.  People who download tarballs usually don't reimport into
Git -- they should just download the actual repositories.

Change-Id: I8d3eb36583d0fb6a3622f34427819fbc39b1b9ff
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoUpdate QML plugin meta data for Qt Creator
Alex Blasche [Wed, 25 Sep 2013 16:14:43 +0000 (18:14 +0200)]
Update QML plugin meta data for Qt Creator

Change-Id: Ie5a9f5f0844adbd1e27753f3f6970b9431d5d741
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQNX: Extend documentation for NDEF message handlers v5.2.0-alpha1
Fabian Bumberger [Wed, 25 Sep 2013 09:44:33 +0000 (11:44 +0200)]
QNX: Extend documentation for NDEF message handlers

Change-Id: If96b4fc9aacc3c16e9e8eb88ab4849ec15e280b5
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQNX: Set the correct target id for the invoke filter
Fabian Bumberger [Wed, 25 Sep 2013 09:30:28 +0000 (11:30 +0200)]
QNX: Set the correct target id for the invoke filter

Change-Id: I328703f2578ffef10e9b475d0015a30ec6671b5b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoDoc: Removed version from \inqmlmodule.
Jerome Pasion [Tue, 24 Sep 2013 16:23:51 +0000 (18:23 +0200)]
Doc: Removed version from \inqmlmodule.

-QDoc ignores the version in \inqmlmodule but it is good to remove
it to avoid confusion.
-QDoc uses \qmlmodule for the import statement

Task-number: QTBUG-32172
Change-Id: If5a3ec8a16aabcf5abec6d1794717ea2c54f0c9f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoRemove private and unused API from QBluetoothServiceInfoPrivate
Alex Blasche [Tue, 24 Sep 2013 10:06:10 +0000 (12:06 +0200)]
Remove private and unused API from QBluetoothServiceInfoPrivate

Presumably this API was intended to update attributes while the service
info object is already registered. It was not implemented anywhere. No
reason to keep it.

Some minor documentation fixes

Change-Id: If6b4b7c37d99027d49a7af48c282725228e9a6c7
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoEmit service discovery error during internal device discovery
Alex Blasche [Mon, 23 Sep 2013 12:55:35 +0000 (14:55 +0200)]
Emit service discovery error during internal device discovery

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>
4 years agoFix peer to peer communication using two local adapters.
Alex Blasche [Mon, 23 Sep 2013 11:52:35 +0000 (13:52 +0200)]
Fix peer to peer communication using two local adapters.

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>
4 years agoEmit ServiceLookup signal in QBluetoothSocket/Bluez when required.
Alex Blasche [Tue, 24 Sep 2013 09:12:32 +0000 (11:12 +0200)]
Emit ServiceLookup signal in QBluetoothSocket/Bluez when required.

Change-Id: Ide9d2cf7fd469e28c584c557ad9e1307aec37f1d
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFixing small QBluetoothServer issues
Alex Blasche [Tue, 24 Sep 2013 08:36:48 +0000 (10:36 +0200)]
Fixing small QBluetoothServer issues

-extending documentation
-emit error signal when setting a new error

Task-number: QTBUG-32669
Change-Id: I16b8a149792ed5068a7bd76af874477084802aea
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agosync.profile: Point to qtsystems#dev
Sergio Ahumada [Tue, 24 Sep 2013 13:00:57 +0000 (15:00 +0200)]
sync.profile: Point to qtsystems#dev

qtconnectivity doesn't really depend on qtsystems, so
this is a temporary solution until qt5.git#qt.pro is
updated.

Change-Id: I89811ccc82d5cc46503ab270f4d50423b3313c60
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoError handling for QBluetoothServer
Fabian Bumberger [Fri, 20 Sep 2013 13:29:39 +0000 (15:29 +0200)]
Error handling for QBluetoothServer

Task-number: QTBUG-32669
Change-Id: I0f12b19f7989972b7c8305f6e11a95f7f25a281d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoRefactor device and service discovery errors
Fabian Bumberger [Thu, 19 Sep 2013 18:27:00 +0000 (20:27 +0200)]
Refactor device and service discovery errors

- 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>
5 years agoQNX: Fix compilation and a compiler warning
Fabian Bumberger [Fri, 20 Sep 2013 10:05:09 +0000 (12:05 +0200)]
QNX: Fix compilation and a compiler warning

Change-Id: Id3de289238013edfc9737f444d3db95be3bd761b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoSimplify QBluetoothTransferManager code.
Alex Blasche [Fri, 20 Sep 2013 08:05:27 +0000 (10:05 +0200)]
Simplify QBluetoothTransferManager code.

QBluetoothTransferManager implementation is very simple. There is no
need for three individual files.

Change-Id: Ia205f96c4b59366f6b9613a7b45f2836a93a03e6
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoRemove compiler warnings
Alex Blasche [Fri, 20 Sep 2013 07:55:39 +0000 (09:55 +0200)]
Remove compiler warnings

Change-Id: I12058d42678187de262b942cce868ac608387351
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoRefactor QDeclarativeBluetoothSocket
Fabian Bumberger [Wed, 18 Sep 2013 16:29:47 +0000 (18:29 +0200)]
Refactor QDeclarativeBluetoothSocket

Change-Id: I7bd36d4b05a28788720b3301eed310c4f4b2d910
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoUnify QBluetoothSoket, QBluetoothServer and QBluetoothServiceInfo protocol enum
Fabian Bumberger [Wed, 18 Sep 2013 15:23:16 +0000 (17:23 +0200)]
Unify QBluetoothSoket, QBluetoothServer and QBluetoothServiceInfo protocol enum

Change-Id: I6e66196a599e2cceabc7d93d728ba97361d8999f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoChanging the way nfc target detection works
Fabian Bumberger [Thu, 12 Sep 2013 09:09:27 +0000 (11:09 +0200)]
Changing the way nfc target detection works

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>
5 years agoQNX: Take socketType and serverType into account
Fabian Bumberger [Wed, 18 Sep 2013 09:28:53 +0000 (11:28 +0200)]
QNX: Take socketType and serverType into account

Also add a serverType member function in QBluetoothServer

Change-Id: I107f73b3943dc84f5c4d2afcb00e303567a67b5d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoAdd remote address property to QBluetoothDiscoveryModel
Fabian Bumberger [Wed, 18 Sep 2013 14:16:12 +0000 (16:16 +0200)]
Add remote address property to QBluetoothDiscoveryModel

Change-Id: I979eaa15d62606206c4c175dcdcaf9d1691f4117
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoLower the verbosity of bluetooth
Fabian Bumberger [Tue, 17 Sep 2013 14:30:32 +0000 (16:30 +0200)]
Lower the verbosity of bluetooth

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>
5 years agoBlackBerry: Add some platform documentation
Fabian Bumberger [Mon, 16 Sep 2013 19:44:40 +0000 (21:44 +0200)]
BlackBerry: Add some platform documentation

Change-Id: If2a8d289578f3bc7622cedd9faf35893880a2157
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoRefactor QBluetoothDiscoveryModel
Fabian Bumberger [Mon, 16 Sep 2013 16:01:13 +0000 (18:01 +0200)]
Refactor QBluetoothDiscoveryModel

- 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>
5 years agoCleanup Bluetooth project dependencies
Alex Blasche [Mon, 16 Sep 2013 08:18:56 +0000 (10:18 +0200)]
Cleanup Bluetooth project dependencies

This removes unnecessary Qt dependencies.

Change-Id: I0ae1fe711808f8e40aed5cc8b535bb5e1da58bff
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoRemove qdeclarativebluetoothimageprovider
Fabian Bumberger [Fri, 13 Sep 2013 14:12:30 +0000 (16:12 +0200)]
Remove qdeclarativebluetoothimageprovider

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>
5 years agoRemove LLCP from the public API
Fabian Bumberger [Tue, 10 Sep 2013 14:56:28 +0000 (16:56 +0200)]
Remove LLCP from the public API

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>
5 years agoFix qdoc warnings
Alex Blasche [Thu, 12 Sep 2013 08:10:38 +0000 (10:10 +0200)]
Fix qdoc warnings

Change-Id: I5efbf42be944ee3dd0ba245b6ecaf752216d2b90
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
5 years agoRemove transactionDetected signal
Fabian Bumberger [Wed, 11 Sep 2013 12:11:26 +0000 (14:11 +0200)]
Remove transactionDetected signal

Not used anywhere.

Change-Id: I1b310addd84b3ab4308c33f296bc71e762d7d7e8
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoFix qmake syntax error
Alex Blasche [Wed, 11 Sep 2013 14:19:59 +0000 (16:19 +0200)]
Fix qmake syntax error

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>
5 years agoClean up QBluetoothDeviceInfo
Fabian Bumberger [Thu, 5 Sep 2013 14:58:46 +0000 (16:58 +0200)]
Clean up QBluetoothDeviceInfo

This patch removes "ManufacturerSpecificData" because it is not implemented and some dead code.

Change-Id: I95a142280835addf65fbedd4a26f3266c7dc0838
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoFix compiler warnings
Alex Blasche [Fri, 6 Sep 2013 06:53:47 +0000 (08:53 +0200)]
Fix compiler warnings

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>
5 years agoRemove QtBluetooth and QtNfc namespace.
Alex Blasche [Thu, 5 Sep 2013 11:32:00 +0000 (13:32 +0200)]
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>
5 years agoMove qNfcChecksum() definition into a .cpp file
Sze Howe Koh [Mon, 9 Sep 2013 03:33:48 +0000 (11:33 +0800)]
Move qNfcChecksum() definition into a .cpp file

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>
5 years agoFix Doc warning in QtBluetooth
Alex Blasche [Fri, 30 Aug 2013 15:17:33 +0000 (17:17 +0200)]
Fix Doc warning in QtBluetooth

Change-Id: I24783920a815ee69eb28f0f37ab4c47af730826c
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoMake Bluetooth adapter choosable for device and service search
Nedim Hadzic [Thu, 29 Aug 2013 12:46:56 +0000 (12:46 +0000)]
Make Bluetooth adapter choosable for device and service search

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>
5 years agoUpdate cmake auto test.
Stephen Kelly [Tue, 3 Sep 2013 21:44:33 +0000 (23:44 +0200)]
Update cmake auto test.

Use the test generator to simplify the test, and add test for the
QtNfc module.

Change-Id: I6775407740572223b4cc8ff5373a49f8933641e5
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoMerge QRfcommServer and QL2capServer to QBluetoothServer
Fabian Bumberger [Fri, 2 Aug 2013 16:09:20 +0000 (18:09 +0200)]
Merge QRfcommServer and QL2capServer to QBluetoothServer

Task-number: QTBUG-32722

Change-Id: Ia75ad5af2f81b737a8cca09dba919a7dc0fa0f8a
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoDon't build the qml/quick modules if Qt is built without QtQuick
Alex Blasche [Wed, 28 Aug 2013 13:49:18 +0000 (15:49 +0200)]
Don't build the qml/quick modules if Qt is built without QtQuick

Change-Id: Ie6a8488a1e2a8ce25ed656a275e86df0006c751b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoMake Bluetooth adapter choosable for device search
Nedim Hadzic [Tue, 27 Aug 2013 17:36:06 +0000 (17:36 +0000)]
Make Bluetooth adapter choosable for device search

In case there are more Bluetooth adapter, device search
might give different results.

Change-Id: Ideddb39460985c18547baec986b15e43946c85de
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Bugfixes for the service discovery agent
Fabian Bumberger [Thu, 8 Aug 2013 13:45:07 +0000 (15:45 +0200)]
QNX: Bugfixes for the service discovery agent

Change-Id: I8d977eb9013a9fa98427080baac1df881985d961
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Change name of platform define to QT_QNX_BLUETOOTH
Fabian Bumberger [Fri, 23 Aug 2013 12:55:24 +0000 (14:55 +0200)]
QNX: Change name of platform define to QT_QNX_BLUETOOTH

To be aligned with the bluez implementation

Change-Id: I8d3fbd0c23298f984e2c99cbf4131cf8fc0a0a64
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Fix segfault when deleting qrfcommserver
Fabian Bumberger [Fri, 23 Aug 2013 09:44:16 +0000 (11:44 +0200)]
QNX: Fix segfault when deleting qrfcommserver

Change-Id: Iefb851c818303c5f8fe2ef783ccfee5d13bcf827
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Fix compilation
Fabian Bumberger [Thu, 22 Aug 2013 13:12:27 +0000 (15:12 +0200)]
QNX: Fix compilation

Change-Id: I075b0d43867c844af05ba8ca86c237b023738da2
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoAdd license files mandated by (L)GPL and FDL.
Timo Jyrinki [Tue, 20 Aug 2013 05:43:59 +0000 (08:43 +0300)]
Add license files mandated by (L)GPL and FDL.

Some rarer modules are still missing the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules, so that the
(L)GPL and FDL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL

Change-Id: I16eebecb075408803055c2e9a1460c3bb98d63ee
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
5 years agoQBluetoothServiceDiscovery auto test fix
Alex Blasche [Thu, 27 Jun 2013 19:24:53 +0000 (21:24 +0200)]
QBluetoothServiceDiscovery auto test fix

Change-Id: I4e20a50549f69367652bd6881a3c541aa283c128
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
5 years agoRemove unnecessary dependency to qtjsbackend from sync.profile
Simon Hausmann [Tue, 13 Aug 2013 08:02:17 +0000 (10:02 +0200)]
Remove unnecessary dependency to qtjsbackend from sync.profile

Change-Id: If59619a55b4d5eecd2c23f85d41606ed1afa8331
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoAdd unit test for QNdefNfcSmartPosterRecord
Stuart Burge [Thu, 4 Jul 2013 22:55:16 +0000 (18:55 -0400)]
Add unit test for QNdefNfcSmartPosterRecord

Task-number: QTBUG-31738

Change-Id: I153c3ea4b03edc0e699596a30f395bfe5cab9d16
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoAdd copy constructor to QNdefNfcSmartPosterRecord to avoid compile error
Alex Blasche [Mon, 12 Aug 2013 14:26:36 +0000 (16:26 +0200)]
Add copy constructor to QNdefNfcSmartPosterRecord to avoid compile error

Change-Id: I133e7f09780d8da3bb88e9971a7f858b905176b4
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoExtend and improve the unit test for QBluetoothServiceInfo
Alex Blasche [Wed, 31 Jul 2013 11:13:09 +0000 (13:13 +0200)]
Extend and improve the unit test for QBluetoothServiceInfo

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>
5 years agoImprove QBluetoothTransferManager unit test
Alex Blasche [Mon, 5 Aug 2013 08:07:05 +0000 (10:07 +0200)]
Improve QBluetoothTransferManager unit test

and fix some minor issues during the process.

Task-number: QTBUG-22017

Change-Id: Iff1adde28ba818c3ed0511cb5d45404f05d7c36f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Make the device discovery agent more robust
Fabian Bumberger [Thu, 8 Aug 2013 09:14:38 +0000 (11:14 +0200)]
QNX: Make the device discovery agent more robust

Also fixes the autotests.

Change-Id: I71983fa3cc49a88bb7b94544b7f24bebbd3cf86e
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Only send radio_init message when Bluetooth is really powered off
Fabian Bumberger [Tue, 6 Aug 2013 15:45:54 +0000 (17:45 +0200)]
QNX: Only send radio_init message when Bluetooth is really powered off

Change-Id: I05b8f14c8b65529eb0502b90d8949ed2a9a8b031
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Close the BT control FD with a delay
Fabian Bumberger [Wed, 7 Aug 2013 08:16:22 +0000 (10:16 +0200)]
QNX: Close the BT control FD with a delay

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>
5 years agoQNX: Change default value for inquiry type in QBluetoothDeviceDiscoveryAgent
Fabian Bumberger [Wed, 7 Aug 2013 09:38:31 +0000 (11:38 +0200)]
QNX: Change default value for inquiry type in QBluetoothDeviceDiscoveryAgent

Change-Id: I46b780875ec8ae7bfd0aeda89b6271a1fa0b30b1
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoClarify the docs for QBluetoothLocalDevice(QBluetoothAddress(),0)
Alex Blasche [Tue, 6 Aug 2013 15:34:01 +0000 (17:34 +0200)]
Clarify the docs for QBluetoothLocalDevice(QBluetoothAddress(),0)

Change-Id: I2bdde67f1f0f6b71190d71b5559bbd88bb2db155
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Use default adapter for default constructed BT address
Fabian Bumberger [Tue, 6 Aug 2013 15:30:59 +0000 (17:30 +0200)]
QNX: Use default adapter for default constructed BT address

Change-Id: I738d77861199ab3ff27f989936daf50c4b2a8202
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Emiting HostPoweredOff when BT is shut down
Fabian Bumberger [Tue, 6 Aug 2013 15:12:02 +0000 (17:12 +0200)]
QNX: Emiting HostPoweredOff when BT is shut down

Change-Id: I14d01fb7ec6795a31ac9f239d34f3f02fd0880b5
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoThe QBluetoothDeviceDiscoveryAgent test is not longer insignificant
Alex Blasche [Mon, 5 Aug 2013 15:25:37 +0000 (17:25 +0200)]
The QBluetoothDeviceDiscoveryAgent test is not longer insignificant

Task-number: QTBUG-22017
Change-Id: I83f1d88ddd6255693f4aa8a2993cd1a818981a75
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX: Emit pairing finished signal
Fabian Bumberger [Thu, 1 Aug 2013 16:15:07 +0000 (18:15 +0200)]
QNX: Emit pairing finished signal

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>
5 years agoImprove btfiletransfer application
Alex Blasche [Wed, 31 Jul 2013 11:12:28 +0000 (13:12 +0200)]
Improve btfiletransfer application

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>
5 years agoDoc: Setting \qtvariable in module page.
Jerome Pasion [Fri, 2 Aug 2013 12:11:28 +0000 (14:11 +0200)]
Doc: Setting \qtvariable in module page.

\qtvariable indicates the QT variable needed in .pro files.

Change-Id: I13d0a179dbea663a85fe9b175bf6770fe673d732
Reviewed-by: Martin Smith <martin.smith@digia.com>
5 years agoQNX: Fix Compilation error and compiler warnings
Fabian Bumberger [Thu, 1 Aug 2013 12:31:50 +0000 (14:31 +0200)]
QNX: Fix Compilation error and compiler warnings

Change-Id: I45df1d1e4a4ce42ee7eb1c7c566e6d7a9aeb8ec2
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoAdding a convenience function for registering an SPP server
Fabian Bumberger [Thu, 25 Jul 2013 12:27:26 +0000 (14:27 +0200)]
Adding a convenience function for registering an SPP server

Change-Id: Ieef40295b3fb5a6b16f3cf8b9c75a9306c161025
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoQNX Bluetooth adding OPP
Fabian Bumberger [Fri, 17 May 2013 14:10:42 +0000 (16:10 +0200)]
QNX Bluetooth adding OPP

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>
5 years agoClean up for OPP
Fabian Bumberger [Tue, 30 Jul 2013 15:44:28 +0000 (17:44 +0200)]
Clean up for OPP

- 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>
5 years agoQNX: Fix compiler warnings
Fabian Bumberger [Wed, 31 Jul 2013 13:49:23 +0000 (15:49 +0200)]
QNX: Fix compiler warnings

Change-Id: Ia73b3a89464d5913bec4cc528047283475297083
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoFix bluetooth device discovery test
Alex Blasche [Wed, 24 Jul 2013 08:37:33 +0000 (10:37 +0200)]
Fix bluetooth device discovery test

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>
5 years agoFix compiler warning
Alex Blasche [Tue, 30 Jul 2013 12:56:40 +0000 (14:56 +0200)]
Fix compiler warning

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>