From 6d39e8425ec1a99c24683ebc809c94a6834a92e1 Mon Sep 17 00:00:00 2001 From: Rolland Dudemaine Date: Thu, 3 Dec 2015 09:18:57 +0100 Subject: [PATCH] Remove the socketpair special case for eventdispatcher on INTEGRITY. The special case was needed for INTEGRITY 5, but select support has since long been added. Change-Id: Ice25c5becc9d7dcdf6c5bc9eeac36b70e1b94df3 Reviewed-by: Oswald Buddenhagen Reviewed-by: Louai Al-Khanji Reviewed-by: Thiago Macieira --- src/corelib/kernel/qeventdispatcher_unix.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index d45ea30a45..b81f94cfc2 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE -#if defined(Q_OS_INTEGRITY) || defined(Q_OS_VXWORKS) +#if defined(Q_OS_VXWORKS) static void initThreadPipeFD(int fd) { int ret = fcntl(fd, F_SETFD, FD_CLOEXEC); @@ -94,15 +94,6 @@ QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate() // initialize the common parts of the event loop #if defined(Q_OS_NACL) // do nothing. -#elif defined(Q_OS_INTEGRITY) - // INTEGRITY doesn't like a "select" on pipes, so use socketpair instead - if (socketpair(AF_INET, SOCK_STREAM, 0, thread_pipe) == -1) { - perror("QEventDispatcherUNIXPrivate(): Unable to create socket pair"); - pipefail = true; - } else { - initThreadPipeFD(thread_pipe[0]); - initThreadPipeFD(thread_pipe[1]); - } #elif defined(Q_OS_VXWORKS) char name[20]; qsnprintf(name, sizeof(name), "/pipe/qt_%08x", int(taskIdSelf()));