AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the socketpair special case for eventdispatcher on INTEGRITY.

Browse Source 
The special case was needed for INTEGRITY 5, but select support has
since long been added.

Change-Id: Ice25c5becc9d7dcdf6c5bc9eeac36b70e1b94df3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Rolland Dudemaine 2015-12-03 09:18:57 +01:00 committed by Thiago Macieira
parent ab352b8b0d
commit 6d39e8425e
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/kernel/qeventdispatcher_unix.cpp
View File

@ -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()));