Change-Id: I1c4615c3d78985fbd410eafcee5a0a9ab72c8763
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

Pairing status was returning Unpaired status even if device was paired.

Change-Id: Ib529cc4868f8043f5d83076f96ac9d71acc7c96f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

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>

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>

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>

Change-Id: I4beb72aac294511b87ef95c459c52daa85c62499
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

Task-number: QTBUG-36893
Change-Id: Ic77fe07aa450001386be0b2e0d4a99f2e674dbb2
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>

This application can be used to manually test most Bluetooth features.

Change-Id: Ib7101ff2f5334026c67c2e00a852d6b10d4674e8
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

Conflicts:
	src/bluetooth/qbluetoothserver.cpp
	src/bluetooth/qbluetoothserver.h

Change-Id: Ia99c341ab6b4fb30d9ceb9e4516c7083eed1c547

It seems the logging frameworks function pointer
creates errors on some compilers.

Change-Id: I35d9b2bbc9817789bfd1eafa9c62d19ca72eda8c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

libbb2 is not available in a public NDK yet. In order to be able to compile NFC for
BlackBerry 10 with a public NDK the BB10 implementation for the QNearfieldShareManager is only
built if libbb2 is detected.

Change-Id: Idd11d4584215fade91db9f79895f901547bce3ef
Reviewed-by: Stuart Burge <sburge@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>

Public headers should not include local header files (qmake warning)
and fix warning about unused parameter.

Change-Id: Id12d2255f6011507649b25ed2bc74356e0f4538e
Reviewed-by: Stuart Burge <sburge@blackberry.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

When connectToService() triggers an SDP discovery the search may
fail. At the beginning of the discovery the socket state was set to
ServiceLookupState. This patch ensures that the socket state resets to
Unconnected if the SDP discovery failed.

Currently only Bluez uses this discovery mechanism and therefore is the
only affected platform.

Change-Id: I982dafc1f5466071bbf910ed3cf7cf7abda14fe4
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

This includes unification of error messages, fixes for spelling
mistakes, hints for translators and other forms of simplifications.

Change-Id: Idd0e01614b24ff2d19133f0d19d49649d59e3f57
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

The custom uuid of a Serial port profile must be part of the service
class property. This enables Android to find the custom uuid.

Change-Id: Ibe0bfcfe6ba7fa6b72a979153afccf17d6b4eb83
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

This is a feature merge to dev targeting Qt 5.3.

Known issues:
-QTBUG-36754: QBluetoothServer::close() crashes
-QTBUG-36763: QBluetothTransferManager port to Android not possible
-QTBUG-36764: Improve QBluetoothLocalDevice::connectedDevices()
-QTBUG-36810: Remove direct use of Android action strings

The above issues and some other minor TODO's will be addressed
until final release time.

Task-number: QTBUG-33792

[ChangeLog][QtBluetooth][Android] QtBluetooth has been ported to
Android.

Change-Id: I31ba83e3b7d6aa68e7258b7e43235de7d1a6e68a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

Provide ability to allow NFC enabled devices to exchange file and data content
using a high-level API.

[ChangeLog][QtNfc][General] A new NFC share API was added.
The API provides sharing of NDEF messages and arbitrary files via
NFC and may potentially use other communication protocols
such as wifi or Bluetooth as part of its implementation.

Change-Id: I878df1702ce4164384096d00e53dcd354d1bfafc
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

Change-Id: I82459078c0510d27ae3611e2914b0ec36ff625ed
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

The connect signal has trouble deciding on the error type.

Change-Id: I6efde7629af832f394b2ae9ba5a266e281a4a1aa
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

Change-Id: I8765fee07cec0588a0336178300129b75c13c30a

1.) If QBluetoothServer::listen(QBluetoothUuid,QString) fails during
service registration we have to ensure that the Server doesn't remain
in listening state.

2.) 29de876f

 sets the socket descriptor
to -1 when closing the QBluetoothSocket. QBluetothServer treats a value
of -1 as error and aborts any call to listen(). This implies that any
call to listen() after the first close() would always fail. This patch
adds some redundancy and first tries to recreate the socket and only if
the re-creation failed exists with an error.

3.) Catch case when user calls listen() on an already listening server.
Documentation has been updated to document the behavior.

Change-Id: I2df13500e74a9741017f7404f0e0c477c96d5356
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

It never returned a valid entry due to wrong QVariant conversion.
The patch changes the public header with a potential to break BC. A
formerly inline function was reimplemented and is no longer inline.
This should be safe though as older header versions can still use
the previous implementation.

Change-Id: If786a366e625a56810b8d4cc682b25d07f72f4e5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

Profiling shows Qt Creator spends 2% of its load time normalizing

Change-Id: I50c4f66f30debd49c37109dd2460925dc22af605
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

Conflicts:
	src/bluetooth/qbluetoothservicediscoveryagent.cpp

Change-Id: I52831fc8c69062e90c003836fd9402f19d6a0ba5

- 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>

[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>

Change-Id: Ide3f00cacd7a42e99823441a45609f8e50063fce
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

This fixes a few cases where errorString, error signal and error code
where out of sync because one was set but not the other. This was
addressed by unifying the usage pattern for error activation to a
pattern where errorString is set and setSocketError() is called
afterwards.

Change-Id: Ibfb04772cf560936aa4ce8ea9643d6a410cc9ee2
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

[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>

This affects Bluez only. The other platforms don't use this feature.
The problem was triggered when connecting, disconnecting and connecting
again to another device. localName() might change due to a different
local Bluetooth adapter being used and peerName() is different anyway
in such cases.

Change-Id: I8983a355832cf4f4d9a654971c54f5624be288e6
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

Bluez never returns anything until the connection has been established.
BlackBerry and the future Android port are much quicker.

Change-Id: Ic465a9b68176e7fff5f0c88b4fb602f8665f7197
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

So far the initial value is compiler dependent. In most cases this meant
it was set to 0. However 0 is not even a valid
QBluetoothSocket::SocketError enum value. The NoSocketError value is -2.

Change-Id: Ieee4f7bd1c97d758295f4d0cc1297f62c114f4f3
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

Change-Id: I8ef9e19de9f48797034fd186dff4b0e096748b1d
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

[ChangeLog][QtBluetooth][General] Added a new
Object-Push example.

Change-Id: I78988771259dd9c7b65080bb7fb9828f6f55ece4
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

The internal socket was closed but not reset to -1 after calling close()
or abort(). As a consequence the subsequent connect() call crashed since
internal socket notifier were invalid

[ChangeLog][QtBluetooth][QBluetoothSocket] Fixed a crash in Bluez part
of QBluetoothSocket() which was caused when triggered when calling
the sequence connect() - abort() - connect().

Change-Id: I21b779c7808d0a5211df9e2481da28e2e9753ca9
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

ThHis is only used on Bluez at this stage. THe SDP agent was initialized
with the local adapter being the remote address of the remote service.
This could never work. The remote address is now properly set (being the
handed over bt address to QBluetoothSocket::connectToService()).

[ChangeLog][QtBluetooth][QtBluetoothSocket] Fixed incorrect
invocation of QBluetoothDiscoveryAgent where the remote service address
was incorrectly assumed to be the local Bt adapter address. This prevented
the detection of the remote service. This bug only affects the Bluez
backend.

Change-Id: Ice2b9c351bfd42f1f4398b14ac68f76315f01fa8
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

Change-Id: I7e74e90225c27cb22e51c488a6a0e563359042fe

Change-Id: I07b915ed029fc1389b57a024dad31dd287c75240
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>