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

Change-Id: Id7698ec157a4e06296bcc27d48aaa8325dd3c23a

5 files changed, 51 insertions, 41 deletions

diff --git a/src/imports/bluetooth/plugin.cpp b/src/imports/bluetooth/plugin.cpp
index 2a152e32..1e9737c6 100644
--- a/src/imports/bluetooth/plugin.cpp
+++ b/src/imports/bluetooth/plugin.cpp
@@ -45,13 +45,6 @@
 #include "qdeclarativebluetoothservice_p.h"
 #include "qdeclarativebluetoothsocket_p.h"
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtBluetooth);
-#endif
-}
-
 QT_USE_NAMESPACE
 
 class QBluetoothQmlPlugin : public QQmlExtensionPlugin
@@ -59,7 +52,7 @@ class QBluetoothQmlPlugin : public QQmlExtensionPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
-    QBluetoothQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+    QBluetoothQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
     void registerTypes(const char *uri)
     {
         // @uri QtBluetooth
@@ -81,10 +74,8 @@ public:
         qmlRegisterType<QDeclarativeBluetoothService        >(uri, major, minor, "BluetoothService");
         qmlRegisterType<QDeclarativeBluetoothSocket         >(uri, major, minor, "BluetoothSocket");
 
-        // Register the 5.9 types
-        // introduces 5.9 version, other existing 5.2 exports become automatically available under 5.2-5.8
-        minor = 9;
-        qmlRegisterType<QDeclarativeBluetoothDiscoveryModel >(uri, major, minor, "BluetoothDiscoveryModel");
+        // Register the latest Qt version as QML type version
+        qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
     }
 };
 
diff --git a/src/imports/bluetooth/plugins.qmltypes b/src/imports/bluetooth/plugins.qmltypes
index e23f8740..a22b950a 100644
--- a/src/imports/bluetooth/plugins.qmltypes
+++ b/src/imports/bluetooth/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtBluetooth 5.9'
+// 'qmlplugindump -nonrelocatable QtBluetooth 5.11'
 
 Module {
     dependencies: ["QtQuick 2.8"]
@@ -13,10 +13,9 @@ Module {
         prototype: "QAbstractListModel"
         exports: [
             "QtBluetooth/BluetoothDiscoveryModel 5.0",
-            "QtBluetooth/BluetoothDiscoveryModel 5.2",
-            "QtBluetooth/BluetoothDiscoveryModel 5.9"
+            "QtBluetooth/BluetoothDiscoveryModel 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0, 0]
+        exportMetaObjectRevisions: [0, 0]
         Enum {
             name: "DiscoveryMode"
             values: {
@@ -93,6 +92,7 @@ Module {
             values: {
                 "NoError": -2,
                 "UnknownSocketError": -1,
+                "RemoteHostClosedError": 1,
                 "HostNotFoundError": 2,
                 "ServiceNotFoundError": 9,
                 "NetworkError": 7,
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
index f2486e81..fc1accbd 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
@@ -142,22 +142,30 @@ QDeclarativeBluetoothDiscoveryModel::QDeclarativeBluetoothDiscoveryModel(QObject
     d(new QDeclarativeBluetoothDiscoveryModelPrivate)
 {
     d->m_deviceAgent = new QBluetoothDeviceDiscoveryAgent(this);
-    connect(d->m_deviceAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)),
-            this, SLOT(deviceDiscovered(QBluetoothDeviceInfo)));
-    connect(d->m_deviceAgent, SIGNAL(finished()), this, SLOT(finishedDiscovery()));
-    connect(d->m_deviceAgent, SIGNAL(canceled()), this, SLOT(finishedDiscovery()));
-    connect(d->m_deviceAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error)),
-            this, SLOT(errorDeviceDiscovery(QBluetoothDeviceDiscoveryAgent::Error)));
-    d->m_deviceAgent->setObjectName("DeviceDiscoveryAgent");
+    connect(d->m_deviceAgent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered,
+            this, QOverload<const QBluetoothDeviceInfo&>::of(&QDeclarativeBluetoothDiscoveryModel::deviceDiscovered));
+    connect(d->m_deviceAgent, &QBluetoothDeviceDiscoveryAgent::finished,
+            this, &QDeclarativeBluetoothDiscoveryModel::finishedDiscovery);
+    connect(d->m_deviceAgent, &QBluetoothDeviceDiscoveryAgent::canceled,
+            this, &QDeclarativeBluetoothDiscoveryModel::finishedDiscovery);
+    connect(d->m_deviceAgent,
+            QOverload<QBluetoothDeviceDiscoveryAgent::Error>::of(&QBluetoothDeviceDiscoveryAgent::error),
+            this,
+            &QDeclarativeBluetoothDiscoveryModel::errorDeviceDiscovery);
+    d->m_deviceAgent->setObjectName(QStringLiteral("DeviceDiscoveryAgent"));
 
     d->m_serviceAgent = new QBluetoothServiceDiscoveryAgent(this);
-    connect(d->m_serviceAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)),
-            this, SLOT(serviceDiscovered(QBluetoothServiceInfo)));
-    connect(d->m_serviceAgent, SIGNAL(finished()), this, SLOT(finishedDiscovery()));
-    connect(d->m_serviceAgent, SIGNAL(canceled()), this, SLOT(finishedDiscovery()));
-    connect(d->m_serviceAgent, SIGNAL(error(QBluetoothServiceDiscoveryAgent::Error)),
-            this, SLOT(errorDiscovery(QBluetoothServiceDiscoveryAgent::Error)));
-    d->m_serviceAgent->setObjectName("ServiceDiscoveryAgent");
+    connect(d->m_serviceAgent, &QBluetoothServiceDiscoveryAgent::serviceDiscovered,
+            this, QOverload<const QBluetoothServiceInfo&>::of(&QDeclarativeBluetoothDiscoveryModel::serviceDiscovered));
+    connect(d->m_serviceAgent, &QBluetoothServiceDiscoveryAgent::finished,
+            this, &QDeclarativeBluetoothDiscoveryModel::finishedDiscovery);
+    connect(d->m_serviceAgent, &QBluetoothServiceDiscoveryAgent::canceled,
+            this, &QDeclarativeBluetoothDiscoveryModel::finishedDiscovery);
+    connect(d->m_serviceAgent,
+            QOverload<QBluetoothServiceDiscoveryAgent::Error>::of(&QBluetoothServiceDiscoveryAgent::error),
+            this,
+            &QDeclarativeBluetoothDiscoveryModel::errorDiscovery);
+    d->m_serviceAgent->setObjectName(QStringLiteral("ServiceDiscoveryAgent"));
 
     QHash<int, QByteArray> roleNames;
     roleNames = QAbstractItemModel::roleNames();
diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
index efbf217b..48c9da9a 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
@@ -297,7 +297,8 @@ void QDeclarativeBluetoothService::setRegistered(bool registered)
     }
 
     d->m_server = server;
-    connect(d->m_server, SIGNAL(newConnection()), this, SLOT(new_connection()));
+    connect(d->m_server, &QBluetoothServer::newConnection,
+            this, &QDeclarativeBluetoothService::new_connection);
 
     d->m_service->setAttribute(QBluetoothServiceInfo::ServiceRecordHandle, (uint)0x00010010);
 
diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
index 0d5a5eae..07de35bc 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
@@ -112,11 +112,16 @@ public:
 
         m_socket = new QBluetoothSocket(socketProtocol);
         m_socket->connectToService(*m_service->serviceInfo());
-        QObject::connect(m_socket, SIGNAL(connected()), m_dbs, SLOT(socket_connected()));
-        QObject::connect(m_socket, SIGNAL(disconnected()), m_dbs, SLOT(socket_disconnected()));
-        QObject::connect(m_socket, SIGNAL(error(QBluetoothSocket::SocketError)), m_dbs, SLOT(socket_error(QBluetoothSocket::SocketError)));
-        QObject::connect(m_socket, SIGNAL(stateChanged(QBluetoothSocket::SocketState)), m_dbs, SLOT(socket_state(QBluetoothSocket::SocketState)));
-        QObject::connect(m_socket, SIGNAL(readyRead()), m_dbs, SLOT(socket_readyRead()));
+        QObject::connect(m_socket, &QBluetoothSocket::connected,
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_connected);
+        QObject::connect(m_socket, &QBluetoothSocket::disconnected,
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_disconnected);
+        QObject::connect(m_socket, QOverload<QBluetoothSocket::SocketError>::of(&QBluetoothSocket::error),
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_error);
+        QObject::connect(m_socket, &QBluetoothSocket::stateChanged,
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_state);
+        QObject::connect(m_socket, &QIODevice::readyRead,
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_readyRead);
     }
 
     QDeclarativeBluetoothSocket *m_dbs;
@@ -363,11 +368,16 @@ void QDeclarativeBluetoothSocket::newSocket(QBluetoothSocket *socket, QDeclarati
     d->m_componentCompleted = true;
     d->m_error = NoError;
 
-    QObject::connect(socket, SIGNAL(connected()), this, SLOT(socket_connected()));
-    QObject::connect(socket, SIGNAL(disconnected()), this, SLOT(socket_disconnected()));
-    QObject::connect(socket, SIGNAL(error(QBluetoothSocket::SocketError)), this, SLOT(socket_error(QBluetoothSocket::SocketError)));
-    QObject::connect(socket, SIGNAL(stateChanged(QBluetoothSocket::SocketState)), this, SLOT(socket_state(QBluetoothSocket::SocketState)));
-    QObject::connect(socket, SIGNAL(readyRead()), this, SLOT(socket_readyRead()));
+    QObject::connect(socket, &QBluetoothSocket::connected,
+                     this, &QDeclarativeBluetoothSocket::socket_connected);
+    QObject::connect(socket, &QBluetoothSocket::disconnected,
+                     this, &QDeclarativeBluetoothSocket::socket_disconnected);
+    QObject::connect(socket, QOverload<QBluetoothSocket::SocketError>::of(&QBluetoothSocket::error),
+                     this, &QDeclarativeBluetoothSocket::socket_error);
+    QObject::connect(socket, &QBluetoothSocket::stateChanged,
+                     this, &QDeclarativeBluetoothSocket::socket_state);
+    QObject::connect(socket, &QIODevice::readyRead,
+                     this, &QDeclarativeBluetoothSocket::socket_readyRead);
 
     socket_state(socket->state());