diff options
| author | Tim Blechmann <tim@klingt.org> | 2015-10-16 10:35:07 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-10-19 16:42:47 +0000 |
| commit | 14709d097fbc0b87be4a1ba5c7a09a40b5ae23e2 (patch) | |
| tree | a0acc90bba4986255559b6ff2a88a05fea02f471 | |
| parent | 75efe9a0f35e74119b5c86992aa0220ebe3fe71e (diff) | |
Fix QCFSocketNotifier in namespaced Qt builds
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>
| -rw-r--r-- | src/platformsupport/cfsocketnotifier/qcfsocketnotifier.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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 + |