Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ie5ce761b77cc5c02647a9f7d52f427401b85d6b0

1 files changed, 4 insertions, 2 deletions

diff --git a/src/bluetooth/qbluetoothserver_bluez.cpp b/src/bluetooth/qbluetoothserver_bluez.cpp
index 2c3bcc8f..d5cdb440 100644
--- a/src/bluetooth/qbluetoothserver_bluez.cpp
+++ b/src/bluetooth/qbluetoothserver_bluez.cpp
@@ -151,9 +151,11 @@ bool QBluetoothServer::listen(const QBluetoothAddress &address, quint16 port)
         else
             convertAddress(device.address().toUInt64(), addr.rc_bdaddr.b);
 
-
         if (::bind(sock, reinterpret_cast<sockaddr *>(&addr), sizeof(sockaddr_rc)) < 0) {
-            d->m_lastError = InputOutputError;
+            if (errno == EADDRINUSE)
+                d->m_lastError = ServiceAlreadyRegisteredError;
+            else
+                d->m_lastError = InputOutputError;
             emit error(d->m_lastError);
             return false;
         }