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

Change-Id: Id0725b35864eb7e99b9efaa3a014f0672f112f71

1 files changed, 3 insertions, 5 deletions

diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
index be8f90c0..7559968d 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
@@ -272,13 +272,11 @@ int QDeclarativeBluetoothServicePrivate::listen() {
         qWarning() << "Unknown protocol, can't make service" << m_protocol;
         return -1;
     }
-    QBluetoothServiceInfo::Protocol serverType;
-    if (m_service->socketProtocol() == QBluetoothServiceInfo::L2capProtocol) {
+    QBluetoothServiceInfo::Protocol serverType = QBluetoothServiceInfo::UnknownProtocol;
+    if (m_service->socketProtocol() == QBluetoothServiceInfo::L2capProtocol)
         serverType = QBluetoothServiceInfo::L2capProtocol;
-    }
-    else if (m_service->socketProtocol() == QBluetoothServiceInfo::RfcommProtocol) {
+    else if (m_service->socketProtocol() == QBluetoothServiceInfo::RfcommProtocol)
         serverType = QBluetoothServiceInfo::RfcommProtocol;
-    }
 
     QBluetoothServer *server = new QBluetoothServer(serverType);
     server->setMaxPendingConnections(1);