Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	.qmake.conf

Change-Id: Id7c4409314c2ad5daf5bc9860befe096a2384849

8 files changed, 65 insertions, 69 deletions

diff --git a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
index dc48514a..6c548f84 100644
--- a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
+++ b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
@@ -839,6 +839,9 @@ public class QtBluetoothLE {
      */
     public String includedServices(String serviceUuid)
     {
+        if (mBluetoothGatt == null)
+            return null;
+
         UUID uuid;
         try {
             uuid = UUID.fromString(serviceUuid);
diff --git a/src/bluetooth/qbluetoothsocket_bluezdbus.cpp b/src/bluetooth/qbluetoothsocket_bluezdbus.cpp
index c98d0c26..d3fc13e4 100644
--- a/src/bluetooth/qbluetoothsocket_bluezdbus.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluezdbus.cpp
@@ -538,6 +538,8 @@ void QBluetoothSocketPrivateBluezDBus::remoteConnected(const QDBusUnixFileDescri
                 q, &QBluetoothSocket::readyRead);
         connect(localSocket, &QLocalSocket::stateChanged,
                 this, &QBluetoothSocketPrivateBluezDBus::socketStateChanged);
+        connect(localSocket, &QLocalSocket::bytesWritten,
+                q, &QBluetoothSocket::bytesWritten);
 
         socket = descriptor;
         q->setSocketState(QBluetoothSocket::ConnectedState);
diff --git a/src/bluetooth/qlowenergycontroller_android_p.h b/src/bluetooth/qlowenergycontroller_android_p.h
index 3f97e363..f05c63ca 100644
--- a/src/bluetooth/qlowenergycontroller_android_p.h
+++ b/src/bluetooth/qlowenergycontroller_android_p.h
@@ -60,15 +60,8 @@
 #include "qlowenergycontroller.h"
 #include "qlowenergycontrollerbase_p.h"
 
-#if QT_CONFIG(bluez) && !defined(QT_BLUEZ_NO_BTLE)
-#include <QtBluetooth/QBluetoothSocket>
-#elif defined(QT_ANDROID_BLUETOOTH)
 #include <QtAndroidExtras/QAndroidJniObject>
 #include "android/lowenergynotificationhub_p.h"
-#elif defined(QT_WINRT_BLUETOOTH)
-#include <wrl.h>
-#include <windows.devices.bluetooth.h>
-#endif
 
 #include <functional>
 
@@ -77,16 +70,7 @@ QT_BEGIN_NAMESPACE
 class QLowEnergyServiceData;
 class QTimer;
 
-#if QT_CONFIG(bluez) && !defined(QT_BLUEZ_NO_BTLE)
-class HciManager;
-class LeCmacCalculator;
-class QSocketNotifier;
-class RemoteDeviceManager;
-#elif defined(QT_ANDROID_BLUETOOTH)
 class LowEnergyNotificationHub;
-#elif defined(QT_WINRT_BLUETOOTH)
-class QWinRTLowEnergyServiceHandler;
-#endif
 
 extern void registerQLowEnergyControllerMetaType();
 
diff --git a/src/nfc/qnearfieldmanager_emulator.cpp b/src/nfc/qnearfieldmanager_emulator.cpp
index 8a61a3a9..4b5e5e0c 100644
--- a/src/nfc/qnearfieldmanager_emulator.cpp
+++ b/src/nfc/qnearfieldmanager_emulator.cpp
@@ -49,10 +49,11 @@ QT_BEGIN_NAMESPACE
 
 QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl()
 {
-    globalTagActivator->initialize();
+    TagActivator *activator = TagActivator::instance();
+    activator->initialize();
 
-    connect(globalTagActivator, &TagActivator::tagActivated, this, &QNearFieldManagerPrivateImpl::tagActivated);
-    connect(globalTagActivator, &TagActivator::tagDeactivated, this, &QNearFieldManagerPrivateImpl::tagDeactivated);
+    connect(activator, &TagActivator::tagActivated, this, &QNearFieldManagerPrivateImpl::tagActivated);
+    connect(activator, &TagActivator::tagDeactivated, this, &QNearFieldManagerPrivateImpl::tagDeactivated);
 }
 
 QNearFieldManagerPrivateImpl::~QNearFieldManagerPrivateImpl()
@@ -66,7 +67,7 @@ bool QNearFieldManagerPrivateImpl::isAvailable() const
 
 void QNearFieldManagerPrivateImpl::reset()
 {
-    globalTagActivator->reset();
+    TagActivator::instance()->reset();
 }
 
 void QNearFieldManagerPrivateImpl::tagActivated(TagBase *tag)
diff --git a/src/nfc/qnearfieldtarget_emulator.cpp b/src/nfc/qnearfieldtarget_emulator.cpp
index 0723b655..aecd743e 100644
--- a/src/nfc/qnearfieldtarget_emulator.cpp
+++ b/src/nfc/qnearfieldtarget_emulator.cpp
@@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE
 static QMutex tagMutex;
 static QMap<TagBase *, bool> tagMap;
 
+Q_GLOBAL_STATIC(TagActivator, globalTagActivator);
+
 TagType1::TagType1(TagBase *tag, QObject *parent)
 :   QNearFieldTagType1(parent), m_tag(tag)
 {
@@ -247,6 +249,11 @@ void TagActivator::reset()
     tagMap.clear();
 }
 
+TagActivator *TagActivator::instance()
+{
+    return globalTagActivator();
+}
+
 void TagActivator::timerEvent(QTimerEvent *e)
 {
     Q_UNUSED(e);
diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h
index 1b9f7bdb..70a67be8 100644
--- a/src/nfc/qnearfieldtarget_emulator_p.h
+++ b/src/nfc/qnearfieldtarget_emulator_p.h
@@ -122,8 +122,6 @@ private:
     int timerId;
 };
 
-Q_GLOBAL_STATIC(TagActivator, globalTagActivator);
-
 QT_END_NAMESPACE
 
 #endif // QNEARFIELDTARGET_EMULATOR_P_H
diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
index b175ddd0..8ffc0480 100644
--- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
+++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
@@ -1755,7 +1755,8 @@ void tst_QLowEnergyController::tst_writeCharacteristic()
     QTRY_VERIFY_WITH_TIMEOUT(
         service->state() == QLowEnergyService::ServiceDiscovered, 30000);
 
-    //test service described by http://processors.wiki.ti.com/index.php/SensorTag_User_Guide
+    // test service described by
+    // http://processors.wiki.ti.com/index.php/CC2650_SensorTag_User%27s_Guide
     const QList<QLowEnergyCharacteristic> chars = service->characteristics();
 
     QLowEnergyCharacteristic dataChar;
@@ -1929,7 +1930,7 @@ void tst_QLowEnergyController::tst_readWriteDescriptor()
         service->state() == QLowEnergyService::ServiceDiscovered, 30000);
 
     // Temperature service described by
-    // http://processors.wiki.ti.com/index.php/SensorTag_User_Guide
+    // http://processors.wiki.ti.com/index.php/CC2650_SensorTag_User%27s_Guide
 
     // 1. Find temperature data characteristic
     const QLowEnergyCharacteristic tempData = service->characteristic(
diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp
index 583a8c6b..fb3a0270 100644
--- a/tests/bttestui/btlocaldevice.cpp
+++ b/tests/bttestui/btlocaldevice.cpp
@@ -49,56 +49,56 @@ BtLocalDevice::BtLocalDevice(QObject *parent) :
     QObject(parent), securityFlags(QBluetooth::NoSecurity)
 {
     localDevice = new QBluetoothLocalDevice(this);
-    connect(localDevice, SIGNAL(error(QBluetoothLocalDevice::Error)),
-            this, SIGNAL(error(QBluetoothLocalDevice::Error)));
-    connect(localDevice, SIGNAL(hostModeStateChanged(QBluetoothLocalDevice::HostMode)),
-            this, SIGNAL(hostModeStateChanged()));
-    connect(localDevice, SIGNAL(pairingFinished(QBluetoothAddress,QBluetoothLocalDevice::Pairing)),
-            this, SLOT(pairingFinished(QBluetoothAddress,QBluetoothLocalDevice::Pairing)));
-    connect(localDevice, SIGNAL(deviceConnected(QBluetoothAddress)),
-            this, SLOT(connected(QBluetoothAddress)));
-    connect(localDevice, SIGNAL(deviceDisconnected(QBluetoothAddress)),
-            this, SLOT(disconnected(QBluetoothAddress)));
-    connect(localDevice, SIGNAL(pairingDisplayConfirmation(QBluetoothAddress,QString)),
-            this, SLOT(pairingDisplayConfirmation(QBluetoothAddress,QString)));
+    connect(localDevice, &QBluetoothLocalDevice::error,
+            this, &BtLocalDevice::error);
+    connect(localDevice, &QBluetoothLocalDevice::hostModeStateChanged,
+            this, &BtLocalDevice::hostModeStateChanged);
+    connect(localDevice, &QBluetoothLocalDevice::pairingFinished,
+            this, &BtLocalDevice::pairingFinished);
+    connect(localDevice, &QBluetoothLocalDevice::deviceConnected,
+            this, &BtLocalDevice::connected);
+    connect(localDevice, &QBluetoothLocalDevice::deviceDisconnected,
+            this, &BtLocalDevice::disconnected);
+    connect(localDevice, &QBluetoothLocalDevice::pairingDisplayConfirmation,
+            this, &BtLocalDevice::pairingDisplayConfirmation);
     connect(localDevice, &QBluetoothLocalDevice::pairingDisplayPinCode,
             this, &BtLocalDevice::pairingDisplayPinCode);
 
     if (localDevice->isValid()) {
         deviceAgent = new QBluetoothDeviceDiscoveryAgent(this);
-        connect(deviceAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)),
-                this, SLOT(deviceDiscovered(QBluetoothDeviceInfo)));
-        connect(deviceAgent, SIGNAL(finished()),
-                this, SLOT(discoveryFinished()));
-        connect(deviceAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error)),
-                this, SLOT(discoveryError(QBluetoothDeviceDiscoveryAgent::Error)));
-        connect(deviceAgent, SIGNAL(canceled()),
-                this, SLOT(discoveryCanceled()));
+        connect(deviceAgent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered,
+                this, &BtLocalDevice::deviceDiscovered);
+        connect(deviceAgent, &QBluetoothDeviceDiscoveryAgent::finished,
+                this, &BtLocalDevice::discoveryFinished);
+        connect(deviceAgent, QOverload<QBluetoothDeviceDiscoveryAgent::Error>::of(&QBluetoothDeviceDiscoveryAgent::error),
+                this, &BtLocalDevice::discoveryError);
+        connect(deviceAgent, &QBluetoothDeviceDiscoveryAgent::canceled,
+                this, &BtLocalDevice::discoveryCanceled);
 
         serviceAgent = new QBluetoothServiceDiscoveryAgent(this);
-        connect(serviceAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)),
-                this, SLOT(serviceDiscovered(QBluetoothServiceInfo)));
-        connect(serviceAgent, SIGNAL(finished()),
-                this, SLOT(serviceDiscoveryFinished()));
-        connect(serviceAgent, SIGNAL(canceled()),
-                this, SLOT(serviceDiscoveryCanceled()));
-        connect(serviceAgent, SIGNAL(error(QBluetoothServiceDiscoveryAgent::Error)),
-                this, SLOT(serviceDiscoveryError(QBluetoothServiceDiscoveryAgent::Error)));
+        connect(serviceAgent, &QBluetoothServiceDiscoveryAgent::serviceDiscovered,
+                this, &BtLocalDevice::serviceDiscovered);
+        connect(serviceAgent, &QBluetoothServiceDiscoveryAgent::finished,
+                this, &BtLocalDevice::serviceDiscoveryFinished);
+        connect(serviceAgent, &QBluetoothServiceDiscoveryAgent::canceled,
+                this, &BtLocalDevice::serviceDiscoveryCanceled);
+        connect(serviceAgent, QOverload<QBluetoothServiceDiscoveryAgent::Error>::of(&QBluetoothServiceDiscoveryAgent::error),
+                this, &BtLocalDevice::serviceDiscoveryError);
 
         socket = new QBluetoothSocket(SOCKET_PROTOCOL, this);
-        connect(socket, SIGNAL(stateChanged(QBluetoothSocket::SocketState)),
-                this, SLOT(socketStateChanged(QBluetoothSocket::SocketState)));
-        connect(socket, SIGNAL(error(QBluetoothSocket::SocketError)),
-                this, SLOT(socketError(QBluetoothSocket::SocketError)));
-        connect(socket, SIGNAL(connected()), this, SLOT(socketConnected()));
-        connect(socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
-        connect(socket, SIGNAL(readyRead()), this, SLOT(readData()));
+        connect(socket, &QBluetoothSocket::stateChanged,
+                this, &BtLocalDevice::socketStateChanged);
+        connect(socket, QOverload<QBluetoothSocket::SocketError>::of(&QBluetoothSocket::error),
+                this, &BtLocalDevice::socketError);
+        connect(socket, &QBluetoothSocket::connected, this, &BtLocalDevice::socketConnected);
+        connect(socket, &QBluetoothSocket::disconnected, this, &BtLocalDevice::socketDisconnected);
+        connect(socket, &QIODevice::readyRead, this, &BtLocalDevice::readData);
         setSecFlags(static_cast<int>(socket->preferredSecurityFlags()));
 
         server = new QBluetoothServer(SOCKET_PROTOCOL, this);
-        connect(server, SIGNAL(newConnection()), this, SLOT(serverNewConnection()));
-        connect(server, SIGNAL(error(QBluetoothServer::Error)),
-                this, SLOT(serverError(QBluetoothServer::Error)));
+        connect(server, &QBluetoothServer::newConnection, this, &BtLocalDevice::serverNewConnection);
+        connect(server, QOverload<QBluetoothServer::Error>::of(&QBluetoothServer::error),
+                this, &BtLocalDevice::serverError);
     } else {
         deviceAgent = nullptr;
         serviceAgent = nullptr;
@@ -675,13 +675,13 @@ void BtLocalDevice::serverNewConnection()
     }
 
     client->setParent(this);
-    connect(client, SIGNAL(disconnected()), this, SLOT(clientSocketDisconnected()));
-    connect(client, SIGNAL(readyRead()), this, SLOT(clientSocketReadyRead()));
-    connect(client, SIGNAL(stateChanged(QBluetoothSocket::SocketState)),
-            this, SLOT(socketStateChanged(QBluetoothSocket::SocketState)));
-    connect(client, SIGNAL(error(QBluetoothSocket::SocketError)),
-            this, SLOT(socketError(QBluetoothSocket::SocketError)));
-    connect(client, SIGNAL(connected()), this, SLOT(socketConnected()));
+    connect(client, &QBluetoothSocket::disconnected, this, &BtLocalDevice::clientSocketDisconnected);
+    connect(client, &QIODevice::readyRead, this, &BtLocalDevice::clientSocketReadyRead);
+    connect(client, &QBluetoothSocket::stateChanged,
+            this, &BtLocalDevice::socketStateChanged);
+    connect(client, QOverload<QBluetoothSocket::SocketError>::of(&QBluetoothSocket::error),
+            this, &BtLocalDevice::socketError);
+    connect(client, &QBluetoothSocket::connected, this, &BtLocalDevice::socketConnected);
     serverSockets.append(client);
 }