<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0b8fe748650a19e0a2edd6f6da0fb2911d3b1fb5">https://github.com/macports/macports-ports/commit/0b8fe748650a19e0a2edd6f6da0fb2911d3b1fb5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0b8fe748650 qt511-qtconnectivity: fix for recent compilers
</span>0b8fe748650 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0b8fe748650a19e0a2edd6f6da0fb2911d3b1fb5
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Sep 12 02:08:02 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt511-qtconnectivity: fix for recent compilers
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/60889
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/qt511/Portfile | 5 +
.../files/patch-qtconnectivity_qtbug_76847.diff | 295 +++++++++++++++++++++
2 files changed, 300 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc26f33a655..d25d136c31a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1332,6 +1332,11 @@ foreach {module module_info} [array get modules] {
</span> # Special Cases
###############################################################################
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtconnectivity" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtconnectivity_qtbug_76847.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # special case
if { ${module} eq "qtdoc" } {
build.target docs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/files/patch-qtconnectivity_qtbug_76847.diff b/aqua/qt511/files/patch-qtconnectivity_qtbug_76847.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ad51fb5c10b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/files/patch-qtconnectivity_qtbug_76847.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,295 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8110fdd4c6d80d05934768fa808a4cb187212fe0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 19 Jul 2019 11:06:59 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Core/IO/Bluetooth - fix ambiguous conversions for macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is a sibling of QTBUG-76847 on macOS instead of iOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I3df6e28d65b9835f5f54e92d462d23423c48d835
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../qbluetoothdevicediscoveryagent_osx.mm | 6 ++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/bluetooth/qbluetoothlocaldevice_osx.mm | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/bluetooth/qbluetoothserver_osx.mm | 6 ++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/bluetooth/qbluetoothserviceinfo_osx.mm | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/bluetooth/qbluetoothsocket_osx.mm | 26 +++++++++----------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/bluetooth/qbluetoothtransferreply_osx.mm | 10 +++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6 files changed, 26 insertions(+), 26 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4657da82..bdc3c85e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,7 +181,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(con
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (inquiryLE && agentState != NonActive) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (inquiryLE.data() && agentState != NonActive) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // We want the LE scan to stop as soon as possible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dispatch_queue_t leQueue = OSXBluetooth::qt_LE_queue()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Local variable to be retained ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,7 +195,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool QBluetoothDeviceDiscoveryAgentPrivate::isValid() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return hostController && [hostController powerState] == kBluetoothHCIPowerStateON;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return hostController.data() && [hostController powerState] == kBluetoothHCIPowerStateON;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool QBluetoothDeviceDiscoveryAgentPrivate::isActive() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -292,7 +292,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::startLE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Check queue and create scanner:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inquiryLE.reset([[LEDeviceInquiryObjC alloc] initWithNotifier:notifier.data()]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (inquiryLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (inquiryLE.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notifier.take(); // Whatever happens next, inquiryLE is already the owner ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dispatch_queue_t leQueue(qt_LE_queue());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/bluetooth/qbluetoothlocaldevice_osx.mm b/src/bluetooth/qbluetoothlocaldevice_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 52b7bba8..e7dd9906 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bluetooth/qbluetoothlocaldevice_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bluetooth/qbluetoothlocaldevice_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,7 +149,7 @@ QBluetoothLocalDevicePrivate::QBluetoothLocalDevicePrivate(QBluetoothLocalDevice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool QBluetoothLocalDevicePrivate::isValid() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return hostController;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return hostController.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void QBluetoothLocalDevicePrivate::requestPairing(const QBluetoothAddress &address, Pairing pairing)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/bluetooth/qbluetoothserver_osx.mm b/src/bluetooth/qbluetoothserver_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eefaf4da..5d3b8fc4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bluetooth/qbluetoothserver_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bluetooth/qbluetoothserver_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +142,7 @@ void QBluetoothServerPrivate::stopListener()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void QBluetoothServerPrivate::openNotify(IOBluetoothRFCOMMChannel *channel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Q_ASSERT_X(listener, Q_FUNC_INFO, "invalid listener (nil)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Q_ASSERT_X(listener.data(), Q_FUNC_INFO, "invalid listener (nil)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT_X(channel, Q_FUNC_INFO, "invalid channel (nil)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +154,7 @@ void QBluetoothServerPrivate::openNotify(IOBluetoothRFCOMMChannel *channel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void QBluetoothServerPrivate::openNotify(IOBluetoothL2CAPChannel *channel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Q_ASSERT_X(listener, Q_FUNC_INFO, "invalid listener (nil)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Q_ASSERT_X(listener.data(), Q_FUNC_INFO, "invalid listener (nil)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT_X(channel, Q_FUNC_INFO, "invalid channel (nil)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -293,7 +293,7 @@ bool QBluetoothServer::listen(const QBluetoothAddress &address, quint16 port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSXBluetooth::qt_test_iobluetooth_runloop();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (d_ptr->listener) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (d_ptr->listener.data()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qCWarning(QT_BT_OSX) << "already in listen mode, close server first";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/bluetooth/qbluetoothserviceinfo_osx.mm b/src/bluetooth/qbluetoothserviceinfo_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 34de4695..7ce4c645 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bluetooth/qbluetoothserviceinfo_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bluetooth/qbluetoothserviceinfo_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,7 +152,7 @@ bool QBluetoothServiceInfoPrivate::unregisterService()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!registered)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Q_ASSERT_X(serviceRecord, Q_FUNC_INFO, "service registered, but serviceRecord is nil");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Q_ASSERT_X(serviceRecord.data(), Q_FUNC_INFO, "service registered, but serviceRecord is nil");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [serviceRecord removeServiceRecord];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ serviceRecord.reset(nil);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/bluetooth/qbluetoothsocket_osx.mm b/src/bluetooth/qbluetoothsocket_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7f630146..2a856092 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bluetooth/qbluetoothsocket_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bluetooth/qbluetoothsocket_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,13 +103,13 @@ void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rfcommChannel.reset([[ObjCRFCOMMChannel alloc] initWithDelegate:this]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (rfcommChannel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rfcommChannel.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = [rfcommChannel connectAsyncToDevice:address withChannelID:port];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = kIOReturnNoMemory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ l2capChannel.reset([[ObjCL2CAPChannel alloc] initWithDelegate:this]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (l2capChannel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (l2capChannel.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = [l2capChannel connectAsyncToDevice:address withPSM:port];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = kIOReturnNoMemory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,10 +183,10 @@ QString QBluetoothSocketPrivate::peerName() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *nsName = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (rfcommChannel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rfcommChannel.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nsName = [rfcommChannel peerName];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (l2capChannel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (l2capChannel.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nsName = [l2capChannel peerName];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,10 +200,10 @@ QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BluetoothDeviceAddress addr = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (rfcommChannel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rfcommChannel.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addr = [rfcommChannel peerAddress];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (l2capChannel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (l2capChannel.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addr = [l2capChannel peerAddress];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,10 +213,10 @@ QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quint16 QBluetoothSocketPrivate::peerPort() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (rfcommChannel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rfcommChannel.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [rfcommChannel getChannelID];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (l2capChannel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (l2capChannel.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [l2capChannel getPSM];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -233,7 +233,7 @@ void QBluetoothSocketPrivate::_q_writeNotify()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT_X(socketType == QBluetoothServiceInfo::L2capProtocol
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || socketType == QBluetoothServiceInfo::RfcommProtocol,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_FUNC_INFO, "invalid socket type");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Q_ASSERT_X(l2capChannel || rfcommChannel, Q_FUNC_INFO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Q_ASSERT_X(l2capChannel.data() || rfcommChannel.data(), Q_FUNC_INFO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "invalid socket (no open channel)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -277,13 +277,13 @@ bool QBluetoothSocketPrivate::setChannel(IOBluetoothRFCOMMChannel *channel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openMode = QIODevice::ReadWrite;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rfcommChannel.reset([[ObjCRFCOMMChannel alloc] initWithDelegate:this channel:channel]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (rfcommChannel) {// We do not handle errors, up to an external user.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rfcommChannel.data()) {// We do not handle errors, up to an external user.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ q_ptr->setOpenMode(QIODevice::ReadWrite);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state = QBluetoothSocket::ConnectedState;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ socketType = QBluetoothServiceInfo::RfcommProtocol;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return rfcommChannel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return rfcommChannel.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool QBluetoothSocketPrivate::setChannel(IOBluetoothL2CAPChannel *channel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,13 +301,13 @@ bool QBluetoothSocketPrivate::setChannel(IOBluetoothL2CAPChannel *channel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openMode = QIODevice::ReadWrite;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ l2capChannel.reset([[ObjCL2CAPChannel alloc] initWithDelegate:this channel:channel]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (l2capChannel) {// We do not handle errors, up to an external user.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (l2capChannel.data()) {// We do not handle errors, up to an external user.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ q_ptr->setOpenMode(QIODevice::ReadWrite);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state = QBluetoothSocket::ConnectedState;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ socketType = QBluetoothServiceInfo::L2capProtocol;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return l2capChannel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return l2capChannel.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/bluetooth/qbluetoothtransferreply_osx.mm b/src/bluetooth/qbluetoothtransferreply_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 65c8f82d..40a747f8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bluetooth/qbluetoothtransferreply_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bluetooth/qbluetoothtransferreply_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,13 +136,13 @@ QBluetoothTransferReplyOSXPrivate::~QBluetoothTransferReplyOSXPrivate()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The OBEX session will be closed then. If
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // somehow IOBluetooth/OBEX still has a reference to our
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // session, it will not call any of delegate's callbacks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (session)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (session.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [session closeSession];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool QBluetoothTransferReplyOSXPrivate::isActive() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return agent || (session && [session hasActiveRequest]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return agent.data() || (session.data() && [session hasActiveRequest]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool QBluetoothTransferReplyOSXPrivate::startOPP(const QBluetoothAddress &device)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -218,7 +218,7 @@ void QBluetoothTransferReplyOSXPrivate::sendConnect(const QBluetoothAddress &dev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void QBluetoothTransferReplyOSXPrivate::sendPut()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT_X(inputStream, Q_FUNC_INFO, "invalid input stream (null)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Q_ASSERT_X(session, Q_FUNC_INFO, "invalid OBEX session (nil)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Q_ASSERT_X(session.data(), Q_FUNC_INFO, "invalid OBEX session (nil)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT_X([session isConnected], Q_FUNC_INFO, "not connected");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT_X(![session hasActiveRequest], Q_FUNC_INFO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "session already has an active request");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,7 +268,7 @@ void QBluetoothTransferReplyOSXPrivate::OBEXConnectError(OBEXError errorCode, OB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_UNUSED(errorCode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_UNUSED(response)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (session) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (session.data()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setReplyError(QBluetoothTransferReply::SessionError,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QCoreApplication::translate(TRANSFER_REPLY, TR_CONNECT_FAILED));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -283,7 +283,7 @@ void QBluetoothTransferReplyOSXPrivate::OBEXConnectError(OBEXError errorCode, OB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void QBluetoothTransferReplyOSXPrivate::OBEXConnectSuccess()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Now that OBEX connect succeeded, we can send an OBEX put request.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!session) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!session.data()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // We're still in OBEXConnect(), it'll take care of next steps.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bluetooth/osx/osxbtledeviceinquiry.mm-orig 2020-01-25 06:17:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bluetooth/osx/osxbtledeviceinquiry.mm 2020-01-25 06:18:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,7 +129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)dealloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (manager) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (manager.data()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [manager setDelegate:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (internalState == InquiryActive)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [manager stopScan];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bluetooth/osx/osxbtperipheralmanager.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bluetooth/osx/osxbtperipheralmanager.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +313,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)startAdvertising
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state = PeripheralState::waitingForPowerOn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (manager)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (manager.data())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [manager setDelegate:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ manager.reset([[CBPeripheralManager alloc] initWithDelegate:self
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ queue:OSXBluetooth::qt_LE_queue()]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -378,7 +378,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void) addServicesToPeripheral
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Q_ASSERT(manager);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Q_ASSERT(manager.data());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nextServiceToAdd < services.size())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [manager addService:services[nextServiceToAdd++]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bluetooth/qlowenergycontroller_osx.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bluetooth/qlowenergycontroller_osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,7 +202,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef Q_OS_TVOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return centralManager;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return centralManager || peripheralManager;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return centralManager.data() || peripheralManager.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>