From 14709d097fbc0b87be4a1ba5c7a09a40b5ae23e2 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Fri, 16 Oct 2015 10:35:07 +0200
Subject: Fix QCFSocketNotifier in namespaced Qt builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without QT_BEGIN/END_NAMESPACE, the qt_mac_socket_callback is not resolved as
a friend function of QCFSocketNotifier, which is required due to access to
private members of QCFSocketNotifier.

Change-Id: Ief89e18f8b4f7fc4cb013a33959db1dd90eb9efe
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
---
 src/platformsupport/cfsocketnotifier/qcfsocketnotifier.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/cfsocketnotifier/qcfsocketnotifier.cpp b/src/platformsupport/cfsocketnotifier/qcfsocketnotifier.cpp
index c58e0ea78d..b3a85292d0 100644
--- a/src/platformsupport/cfsocketnotifier/qcfsocketnotifier.cpp
+++ b/src/platformsupport/cfsocketnotifier/qcfsocketnotifier.cpp
@@ -36,6 +36,7 @@
 #include <QtCore/qsocketnotifier.h>
 #include <QtCore/qthread.h>
 
+QT_BEGIN_NAMESPACE
 
 /**************************************************************************
     Socket Notifiers
@@ -301,3 +302,6 @@ void QCFSocketNotifier::enableSocketNotifiers(CFRunLoopObserverRef ref, CFRunLoo
         }
     }
 }
+
+QT_END_NAMESPACE
+
-- 
cgit v1.2.3