http://macieira.org/~thiago/qt-5.3/QtBluetooth.diff
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h
index a311d14..4ac1685 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h
@@ -66,6 +66,7 @@ public:
NoError,
InputOutputError,
PoweredOffError,
+ InvalidBluetoothAdapterError,
UnknownError = 100 //New errors must be added before Unknown error
};
diff --git a/src/bluetooth/qbluetoothhostinfo.h b/src/bluetooth/qbluetoothhostinfo.h
index 24590eb..b4428a8 100644
--- a/src/bluetooth/qbluetoothhostinfo.h
+++ b/src/bluetooth/qbluetoothhostinfo.h
@@ -55,6 +55,8 @@ public:
QBluetoothHostInfo(const QBluetoothHostInfo &other);
~QBluetoothHostInfo();
+ QBluetoothHostInfo &operator=(const QBluetoothHostInfo &other);
+
QBluetoothAddress address() const;
void setAddress(const QBluetoothAddress &address);
diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h
index 713b503..597496b 100644
--- a/src/bluetooth/qbluetoothlocaldevice.h
+++ b/src/bluetooth/qbluetoothlocaldevice.h
@@ -91,6 +91,7 @@ public:
void setHostMode(QBluetoothLocalDevice::HostMode mode);
HostMode hostMode() const;
+ QList<QBluetoothAddress> connectedDevices() const;
void powerOn();
@@ -104,6 +105,8 @@ public Q_SLOTS:
Q_SIGNALS:
void hostModeStateChanged(QBluetoothLocalDevice::HostMode state);
+ void deviceConnected(const QBluetoothAddress &address);
+ void deviceDisconnected(const QBluetoothAddress &address);
void pairingFinished(const QBluetoothAddress &address, QBluetoothLocalDevice::Pairing pairing);
void pairingDisplayPinCode(const QBluetoothAddress &address, QString pin);
diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h
index d4468cb..6157384 100644
--- a/src/bluetooth/qbluetoothserver.h
+++ b/src/bluetooth/qbluetoothserver.h
@@ -97,7 +97,7 @@ public:
Q_SIGNALS:
void newConnection();
- void error(Error);
+ void error(QBluetoothServer::Error error);
protected:
QBluetoothServerPrivate *d_ptr;
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h
index f923c2d..59c7b74 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.h
@@ -65,6 +65,7 @@ public:
NoError = QBluetoothDeviceDiscoveryAgent::NoError,
InputOutputError = QBluetoothDeviceDiscoveryAgent::InputOutputError,
PoweredOffError = QBluetoothDeviceDiscoveryAgent::PoweredOffError,
+ InvalidBluetoothAdapterError = QBluetoothDeviceDiscoveryAgent::InvalidBluetoothAdapterError,
UnknownError = QBluetoothDeviceDiscoveryAgent::UnknownError //=100
//New Errors must be added after Unknown Error the space before UnknownError is reserved
//for future device discovery errors
@@ -114,6 +115,12 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*))
Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*))
#endif
+#ifdef QT_ANDROID_BLUETOOTH
+ Q_PRIVATE_SLOT(d_func(), void _q_processFetchedUuids(const QBluetoothAddress &address,
+ const QList<QBluetoothUuid>&))
+ Q_PRIVATE_SLOT(d_func(), void _q_fetchUuidsTimeout())
+ Q_PRIVATE_SLOT(d_func(), void _q_hostModeStateChanged(QBluetoothLocalDevice::HostMode state))
+#endif
};
QT_END_NAMESPACE
diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h
index 0e6555c..4d3b861 100644
--- a/src/bluetooth/qbluetoothserviceinfo.h
+++ b/src/bluetooth/qbluetoothserviceinfo.h
@@ -141,7 +141,7 @@ public:
inline void setServiceUuid(const QBluetoothUuid &uuid);
inline QBluetoothUuid serviceUuid() const;
- inline QList<QBluetoothUuid> serviceClassUuids() const;
+ QList<QBluetoothUuid> serviceClassUuids() const;
QBluetoothServiceInfo &operator=(const QBluetoothServiceInfo &other);
@@ -228,12 +228,6 @@ inline QBluetoothUuid QBluetoothServiceInfo::serviceUuid() const
{
return attribute(ServiceId).value<QBluetoothUuid>();
}
-
-inline QList<QBluetoothUuid> QBluetoothServiceInfo::serviceClassUuids() const
-{
- return attribute(ServiceClassIds).value<QList<QBluetoothUuid> >();
-}
-
QT_END_NAMESPACE
#endif
diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h
index cc580d0..0cc765c 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
diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h
index 42571ca..33910fd 100644
--- a/src/bluetooth/qbluetoothtransferreply.h
+++ b/src/bluetooth/qbluetoothtransferreply.h
@@ -61,7 +61,9 @@ public:
UnknownError,
FileNotFoundError,
HostNotFoundError,
- UserCanceledTransferError
+ UserCanceledTransferError,
+ IODeviceNotReadableError,
+ ResourceBusyError
};
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index ef69e98..014b975 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -112,6 +112,7 @@ public:
GN = 0x1117,
DirectPrinting = 0x1118,
ReferencePrinting = 0x1119,
+ BasicImage = 0x111a,
ImagingResponder = 0x111b,
ImagingAutomaticArchive = 0x111c,
ImagingReferenceObjects = 0x111d,
@@ -133,7 +134,14 @@ public:
MessageAccessServer = 0x1132,
MessageNotificationServer = 0x1133,
MessageAccessProfile = 0x1134,
- PnPInformation = 0x1135,
+ GNSS = 0x1135,
+ GNSSServer = 0x1136,
+ Display3D = 0x1137,
+ Glasses3D = 0x1138,
+ Synchronization3D = 0x1139,
+ MPSProfile = 0x113a,
+ MPSService = 0x113b,
+ PnPInformation = 0x1200,
GenericNetworking = 0x1201,
GenericFileTransfer = 0x1202,
GenericAudio = 0x1203,
_______________________________________________
Development mailing list
[email protected]
http://lists.qt-project.org/mailman/listinfo/development
