Port QtBluetooth to Android

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>

1 files changed, 7 insertions, 5 deletions

diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h
index 5a21d551..0cc765cd 100644
--- a/src/bluetooth/qbluetoothsocket.h
+++ b/src/bluetooth/qbluetoothsocket.h
@@ -78,11 +78,13 @@ public:
 
     enum SocketError {
         NoSocketError = -2,
-        UnknownSocketError = QAbstractSocket::UnknownSocketError,
-        HostNotFoundError = QAbstractSocket::HostNotFoundError,
-        ServiceNotFoundError = QAbstractSocket::SocketAddressNotAvailableError,
-        NetworkError = QAbstractSocket::NetworkError,
-        UnsupportedProtocolError
+        UnknownSocketError = QAbstractSocket::UnknownSocketError, //-1
+        HostNotFoundError = QAbstractSocket::HostNotFoundError, //2
+        ServiceNotFoundError = QAbstractSocket::SocketAddressNotAvailableError, //9
+        NetworkError = QAbstractSocket::NetworkError, //7
+        UnsupportedProtocolError = 8,
+        OperationError = QAbstractSocket::OperationError //19
+        //New enums (independent of QAbstractSocket) should be added from 100 onwards
     };
 
     explicit QBluetoothSocket(QBluetoothServiceInfo::Protocol socketType, QObject *parent = 0);   // create socket of type socketType