From b5de909c3aab352c45f0a1211b026429f8dddf42 Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Thu, 24 Oct 2019 15:58:56 +0200
Subject: QBluetoothSocket(macOS) - fix _q_writeNotify's invocation

After the recent refactoring the writing ability was severed.

Change-Id: Ib9f116cdbbbfd87593381cb62675cab4930a2ef1
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 src/bluetooth/qbluetoothsocket_osx.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bluetooth/qbluetoothsocket_osx.mm b/src/bluetooth/qbluetoothsocket_osx.mm
index f74c14f8..8af085ac 100644
--- a/src/bluetooth/qbluetoothsocket_osx.mm
+++ b/src/bluetooth/qbluetoothsocket_osx.mm
@@ -196,7 +196,7 @@ qint64 QBluetoothSocketPrivate::writeData(const char *data, qint64 maxSize)
     // IOBluetoothL2CAPChannel is buffered (writeAsync).
 
     if (!txBuffer.size())
-        QMetaObject::invokeMethod(this, "_q_writeNotify", Qt::QueuedConnection);
+        QMetaObject::invokeMethod(this, [this](){_q_writeNotify();}, Qt::QueuedConnection);
 
     char *dst = txBuffer.reserve(int(maxSize));
     std::copy(data, data + maxSize, dst);
-- 
cgit v1.2.3


From 117a0b3b03614ad9148a09fff4ca0dcff0ace86a Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@gmail.com>
Date: Fri, 1 Nov 2019 15:47:06 +0100
Subject: Build fix: Add errno.h include header for errno usage

With Clang-Mingw the value for EADDRINUSE was not known, unless
errno.h was included.

Change-Id: I8a75a9c7b8f4578ab6c829d424d59a1c6185376b
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/bluetooth/qbluetoothserver_win.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bluetooth/qbluetoothserver_win.cpp b/src/bluetooth/qbluetoothserver_win.cpp
index a57d39a5..70695112 100644
--- a/src/bluetooth/qbluetoothserver_win.cpp
+++ b/src/bluetooth/qbluetoothserver_win.cpp
@@ -48,6 +48,7 @@
 #include <winsock2.h>
 #include <ws2bth.h>
 #include <bluetoothapis.h>
+#include <errno.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3