<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/6e7beba699ef3951ef06aac90a24337120caca8e">https://github.com/macports/macports-ports/commit/6e7beba699ef3951ef06aac90a24337120caca8e</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 6e7beba699e qt58-qtconnectivity: fix patch
</span>6e7beba699e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6e7beba699ef3951ef06aac90a24337120caca8e
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sun Sep 11 06:49:54 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt58-qtconnectivity: fix patch
</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;'> Fixes: https://trac.macports.org/ticket/65822
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
.../files/patch-qtconnectivity_qtbug_76847.diff | 112 ++++++++++++---------
1 file changed, 63 insertions(+), 49 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/files/patch-qtconnectivity_qtbug_76847.diff b/aqua/qt58/files/patch-qtconnectivity_qtbug_76847.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 696def63937..680581e8ccc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/files/patch-qtconnectivity_qtbug_76847.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/files/patch-qtconnectivity_qtbug_76847.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,28 @@
</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> diff --git src/bluetooth/osx/osxbtledeviceinquiry.mm src/bluetooth/osx/osxbtledeviceinquiry.mm
index 4c000a2..d2ff1d4 100644
--- src/bluetooth/osx/osxbtledeviceinquiry.mm
+++ src/bluetooth/osx/osxbtledeviceinquiry.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,7 +117,7 @@ QT_USE_NAMESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +139,7 @@ QT_USE_NAMESPACE
</span>
- (void)dealloc
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +35,7 @@ diff --git src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm src/bluetooth/qbl
</span> index 18cda39..db982a5 100644
--- src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
+++ src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,7 +197,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(con
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,7 +181,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(con
</span>
QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate()
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,19 +44,22 @@ index 18cda39..db982a5 100644
</span> // We want the LE scan to stop as soon as possible.
if (dispatch_queue_t leQueue = OSXBluetooth::qt_LE_queue()) {
// Local variable to be retained ...
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -215,8 +215,8 @@ bool QBluetoothDeviceDiscoveryAgentPrivate::isValid() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // can fail to initialize some important data-members
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // (and the error is probably not even related to Bluetooth at all)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // - say, allocation error - this is what meant here by valid/invalid.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return hostController && [hostController powerState] == kBluetoothHCIPowerStateON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && inquiry;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return hostController.data() && [hostController powerState] == kBluetoothHCIPowerStateON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && inquiry.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,7 +195,7 @@ bool QBluetoothDeviceDiscoveryAgentPrivate::isValid() const
</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> }
bool QBluetoothDeviceDiscoveryAgentPrivate::isActive() const
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -266,7 +266,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::startLE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inquiryLE.reset([[LEDeviceInquiryObjC alloc] init]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,11 +290,11 @@ void setError(QBluetoothDeviceDiscoveryAgent::Error,
</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>
dispatch_queue_t leQueue(qt_LE_queue());
- if (!leQueue || !inquiryLE) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,20 +67,11 @@ index 18cda39..db982a5 100644
</span> setError(QBluetoothDeviceDiscoveryAgent::UnknownError,
QCoreApplication::translate(DEV_DISCOVERY, DD_NOT_STARTED_LE));
agentState = NonActive;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -442,7 +442,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::setError(QBluetoothDeviceDiscoveryAg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void QBluetoothDeviceDiscoveryAgentPrivate::checkLETimeout()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_ASSERT_X(agentState == LEScan, Q_FUNC_INFO, "invalid agent state");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Q_ASSERT_X(inquiryLE, Q_FUNC_INFO, "LE device inquiry is nil");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Q_ASSERT_X(inquiryLE.data(), Q_FUNC_INFO, "LE device inquiry is nil");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace OSXBluetooth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> diff --git src/bluetooth/qbluetoothlocaldevice_osx.mm src/bluetooth/qbluetoothlocaldevice_osx.mm
index 24cc2bb..f204774 100644
--- src/bluetooth/qbluetoothlocaldevice_osx.mm
+++ src/bluetooth/qbluetoothlocaldevice_osx.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -147,7 +147,7 @@ QBluetoothLocalDevicePrivate::QBluetoothLocalDevicePrivate(QBluetoothLocalDevice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,7 +149,7 @@ QBluetoothLocalDevicePrivate::QBluetoothLocalDevicePrivate(QBluetoothLocalDevice
</span>
bool QBluetoothLocalDevicePrivate::isValid() const
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +84,7 @@ diff --git src/bluetooth/qbluetoothserver_osx.mm src/bluetooth/qbluetoothserver_
</span> index 99fcf58..352c793 100644
--- src/bluetooth/qbluetoothserver_osx.mm
+++ src/bluetooth/qbluetoothserver_osx.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,7 +114,7 @@ bool QBluetoothServerPrivate::startListener(quint16 realPort)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@ bool QBluetoothServerPrivate::startListener(quint16 realPort)
</span> return false;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +93,7 @@ index 99fcf58..352c793 100644
</span> listener.reset([[ObjCListener alloc] initWithListener:this]);
bool result = false;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,7 +136,7 @@ void QBluetoothServerPrivate::stopListener()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +142,7 @@ void QBluetoothServerPrivate::stopListener()
</span>
void QBluetoothServerPrivate::openNotify(IOBluetoothRFCOMMChannel *channel)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +102,7 @@ index 99fcf58..352c793 100644
</span> Q_ASSERT_X(channel, Q_FUNC_INFO, "invalid channel (nil)");
Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,7 +148,7 @@ void QBluetoothServerPrivate::openNotify(IOBluetoothRFCOMMChannel *channel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +154,7 @@ void QBluetoothServerPrivate::openNotify(IOBluetoothRFCOMMChannel *channel)
</span>
void QBluetoothServerPrivate::openNotify(IOBluetoothL2CAPChannel *channel)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,33 +111,33 @@ index 99fcf58..352c793 100644
</span> Q_ASSERT_X(channel, Q_FUNC_INFO, "invalid channel (nil)");
Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -285,7 +285,7 @@ bool QBluetoothServer::listen(const QBluetoothAddress &address, quint16 port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -291,7 +291,7 @@ bool QBluetoothServer::listen(const QBluetoothAddress &address, quint16 port)
</span> {
typedef QBluetoothServerPrivate::ObjCListener ObjCListener;
- if (d_ptr->listener) {
+ if (d_ptr->listener.data()) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "already in listen mode, "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "close server first";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qCWarning(QT_BT_OSX) << "already in listen mode, close server first";
</span> return false;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> diff --git src/bluetooth/qbluetoothserviceinfo_osx.mm src/bluetooth/qbluetoothserviceinfo_osx.mm
index ee19f1d..f540b1f 100644
--- src/bluetooth/qbluetoothserviceinfo_osx.mm
+++ src/bluetooth/qbluetoothserviceinfo_osx.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,7 +239,7 @@ bool QBluetoothServiceInfoPrivate::unregisterService()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,7 +172,7 @@ bool QBluetoothServiceInfoPrivate::unregisterService()
</span> if (!registered)
return false;
- Q_ASSERT_X(serviceRecord, Q_FUNC_INFO, "service registered, but serviceRecord is nil");
+ Q_ASSERT_X(serviceRecord.data(), Q_FUNC_INFO, "service registered, but serviceRecord is nil");
<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:#ffe0e0;'>- #if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_9) {
</span> diff --git src/bluetooth/qbluetoothsocket_osx.mm src/bluetooth/qbluetoothsocket_osx.mm
index aa99455..c6ccde8 100644
--- src/bluetooth/qbluetoothsocket_osx.mm
+++ src/bluetooth/qbluetoothsocket_osx.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,13 +97,13 @@ void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,13 +103,13 @@ void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address,
</span>
if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
rfcommChannel.reset([[ObjCRFCOMMChannel alloc] initWithDelegate:this]);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +153,7 @@ index aa99455..c6ccde8 100644
</span> status = [l2capChannel connectAsyncToDevice:address withPSM:port];
else
status = kIOReturnNoMemory;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,10 +177,10 @@ QString QBluetoothSocketPrivate::peerName() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,10 +183,10 @@ QString QBluetoothSocketPrivate::peerName() const
</span>
NSString *nsName = nil;
if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +166,7 @@ index aa99455..c6ccde8 100644
</span> nsName = [l2capChannel peerName];
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -194,10 +194,10 @@ QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,10 +200,10 @@ QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
</span> {
BluetoothDeviceAddress addr = {};
if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,7 +179,7 @@ index aa99455..c6ccde8 100644
</span> addr = [l2capChannel peerAddress];
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -207,10 +207,10 @@ QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,10 +213,10 @@ QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
</span> quint16 QBluetoothSocketPrivate::peerPort() const
{
if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,7 +192,7 @@ index aa99455..c6ccde8 100644
</span> return [l2capChannel getPSM];
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -227,7 +227,7 @@ void QBluetoothSocketPrivate::_q_writeNotify()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -233,7 +233,7 @@ void QBluetoothSocketPrivate::_q_writeNotify()
</span> Q_ASSERT_X(socketType == QBluetoothServiceInfo::L2capProtocol
|| socketType == QBluetoothServiceInfo::RfcommProtocol,
Q_FUNC_INFO, "invalid socket type");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,7 +201,7 @@ index aa99455..c6ccde8 100644
</span> "invalid socket (no open channel)");
Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -271,13 +271,13 @@ bool QBluetoothSocketPrivate::setChannel(IOBluetoothRFCOMMChannel *channel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -277,13 +277,13 @@ bool QBluetoothSocketPrivate::setChannel(IOBluetoothRFCOMMChannel *channel)
</span>
openMode = QIODevice::ReadWrite;
rfcommChannel.reset([[ObjCRFCOMMChannel alloc] initWithDelegate:this channel:channel]);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,7 +217,7 @@ index aa99455..c6ccde8 100644
</span> }
bool QBluetoothSocketPrivate::setChannel(IOBluetoothL2CAPChannel *channel)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -295,13 +295,13 @@ 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>
openMode = QIODevice::ReadWrite;
l2capChannel.reset([[ObjCL2CAPChannel alloc] initWithDelegate:this channel:channel]);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,7 +237,7 @@ diff --git src/bluetooth/qbluetoothtransferreply_osx.mm src/bluetooth/qbluetooth
</span> index 1b84626..fd55e50 100644
--- src/bluetooth/qbluetoothtransferreply_osx.mm
+++ src/bluetooth/qbluetoothtransferreply_osx.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,13 +130,13 @@ QBluetoothTransferReplyOSXPrivate::~QBluetoothTransferReplyOSXPrivate()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,13 +136,13 @@ QBluetoothTransferReplyOSXPrivate::~QBluetoothTransferReplyOSXPrivate()
</span> // The OBEX session will be closed then. If
// somehow IOBluetooth/OBEX still has a reference to our
// session, it will not call any of delegate's callbacks.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +253,7 @@ index 1b84626..fd55e50 100644
</span> }
bool QBluetoothTransferReplyOSXPrivate::startOPP(const QBluetoothAddress &device)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -212,7 +212,7 @@ void QBluetoothTransferReplyOSXPrivate::sendConnect(const QBluetoothAddress &dev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -218,7 +218,7 @@ void QBluetoothTransferReplyOSXPrivate::sendConnect(const QBluetoothAddress &dev
</span> void QBluetoothTransferReplyOSXPrivate::sendPut()
{
Q_ASSERT_X(inputStream, Q_FUNC_INFO, "invalid input stream (null)");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,7 +262,7 @@ index 1b84626..fd55e50 100644
</span> Q_ASSERT_X([session isConnected], Q_FUNC_INFO, "not connected");
Q_ASSERT_X(![session hasActiveRequest], Q_FUNC_INFO,
"session already has an active request");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,7 +262,7 @@ void QBluetoothTransferReplyOSXPrivate::OBEXConnectError(OBEXError errorCode, OB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,7 +268,7 @@ void QBluetoothTransferReplyOSXPrivate::OBEXConnectError(OBEXError errorCode, OB
</span> Q_UNUSED(errorCode)
Q_UNUSED(response)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,7 +271,7 @@ index 1b84626..fd55e50 100644
</span> setReplyError(QBluetoothTransferReply::SessionError,
QCoreApplication::translate(TRANSFER_REPLY, TR_CONNECT_FAILED));
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -277,7 +277,7 @@ void QBluetoothTransferReplyOSXPrivate::OBEXConnectError(OBEXError errorCode, OB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -283,7 +283,7 @@ void QBluetoothTransferReplyOSXPrivate::OBEXConnectError(OBEXError errorCode, OB
</span> void QBluetoothTransferReplyOSXPrivate::OBEXConnectSuccess()
{
// Now that OBEX connect succeeded, we can send an OBEX put request.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,12 +284,12 @@ diff --git src/bluetooth/qlowenergycontroller_osx.mm src/bluetooth/qlowenergycon
</span> index a0b33a9..fa6e32a 100644
--- src/bluetooth/qlowenergycontroller_osx.mm
+++ src/bluetooth/qlowenergycontroller_osx.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -202,7 +202,7 @@ QLowEnergyControllerPrivateOSX::~QLowEnergyControllerPrivateOSX()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool QLowEnergyControllerPrivateOSX::isValid() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return centralManager;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return centralManager.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,7 +200,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:#ffe0e0;'>- void QLowEnergyControllerPrivateOSX::_q_connected()
</span></pre><pre style='margin:0'>
</pre>