Merge remote-tracking branch 'gerrit/stable' into dev

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

Change-Id: Ia99c341ab6b4fb30d9ceb9e4516c7083eed1c547

4 files changed, 3 insertions, 5 deletions

diff --git a/src/bluetooth/qbluetoothserver.cpp b/src/bluetooth/qbluetoothserver.cpp
index 670b522f..3a7e495f 100644
--- a/src/bluetooth/qbluetoothserver.cpp
+++ b/src/bluetooth/qbluetoothserver.cpp
@@ -216,10 +216,9 @@ QBluetoothServiceInfo QBluetoothServer::listen(const QBluetoothUuid &uuid, const
     serviceInfo.setAttribute(QBluetoothServiceInfo::BluetoothProfileDescriptorList,
                              classId);
 
-    //Android requires custom uuid to be set as service class and not as service uuid
+    //Android requires custom uuid to be set as service class
     classId.prepend(QVariant::fromValue(uuid));
     serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classId);
-
     serviceInfo.setServiceUuid(uuid);
 
     QBluetoothServiceInfo::Sequence protocolDescriptorList;
diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h
index 9b1d54c4..61573843 100644
--- a/src/bluetooth/qbluetoothserver.h
+++ b/src/bluetooth/qbluetoothserver.h
@@ -97,7 +97,7 @@ public:
 
 Q_SIGNALS:
     void newConnection();
-    void error(QBluetoothServer::Error);
+    void error(QBluetoothServer::Error error);
 
 protected:
     QBluetoothServerPrivate *d_ptr;
diff --git a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
index b9120c07..bde3e264 100644
--- a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
+++ b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
@@ -266,8 +266,6 @@ bool QBluetoothServiceInfoPrivate::registerService(const QBluetoothAddress &loca
 
     stream.writeEndDocument();
 
-    qCDebug(QT_BT_BLUEZ) << xmlServiceRecord;
-
     if (!registered) {
         QDBusPendingReply<uint> reply = service->AddRecord(xmlServiceRecord);
         reply.waitForFinished();
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index bd4b43fb..c7aea0b7 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -587,6 +587,7 @@ void QBluetoothSocket::discoveryFinished()
         qCDebug(QT_BT) << "Didn't find any";
         d->errorString = tr("Service cannot be found");
         setSocketError(ServiceNotFoundError);
+        setSocketState(QBluetoothSocket::UnconnectedState);
         d->discoveryAgent->deleteLater();
         d->discoveryAgent = 0;
     }