1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Windows CE build hacks from QWindowsPipeWriter

Browse Source 
Those were added in ancient times to make QWindowsPipeWriter compile
on Windows CE. It was never used though.

Change-Id: Ica71b182f7ee4e47d9e33638d78475842b2ecdff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Joerg Bornemann 2015-04-09 16:21:37 +02:00
parent 3cf4c492c2
commit 707068bd66
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/io/qwindowspipewriter.cpp
View File

@ -43,13 +43,8 @@ QWindowsPipeWriter::QWindowsPipeWriter(HANDLE pipe, QObject * parent)
quitNow(false), quitNow(false),
hasWritten(false) hasWritten(false)
{ {
#if !defined(Q_OS_WINCE) || (_WIN32_WCE >= 0x600)
DuplicateHandle(GetCurrentProcess(), pipe, GetCurrentProcess(), DuplicateHandle(GetCurrentProcess(), pipe, GetCurrentProcess(),
&writePipe, 0, FALSE, DUPLICATE_SAME_ACCESS); &writePipe, 0, FALSE, DUPLICATE_SAME_ACCESS);
#else
Q_UNUSED(pipe);
writePipe = GetCurrentProcess();
#endif
} }
QWindowsPipeWriter::~QWindowsPipeWriter() QWindowsPipeWriter::~QWindowsPipeWriter()
@ -60,9 +55,7 @@ QWindowsPipeWriter::~QWindowsPipeWriter()
lock.unlock(); lock.unlock();
if (!wait(30000)) if (!wait(30000))
terminate(); terminate();
#if !defined(Q_OS_WINCE) || (_WIN32_WCE >= 0x600)
CloseHandle(writePipe); CloseHandle(writePipe);
#endif
} }
bool QWindowsPipeWriter::waitForWrite(int msecs) bool QWindowsPipeWriter::waitForWrite(int msecs)
@ -153,7 +146,6 @@ void QWindowsPipeWriter::run()
msleep(100); msleep(100);
continue; continue;
} }
#ifndef Q_OS_WINCE
if (writeError != ERROR_IO_PENDING) { if (writeError != ERROR_IO_PENDING) {
qErrnoWarning(writeError, "QWindowsPipeWriter: async WriteFile failed."); qErrnoWarning(writeError, "QWindowsPipeWriter: async WriteFile failed.");
return; return;
@ -162,9 +154,6 @@ void QWindowsPipeWriter::run()
qErrnoWarning(GetLastError(), "QWindowsPipeWriter: GetOverlappedResult failed."); qErrnoWarning(GetLastError(), "QWindowsPipeWriter: GetOverlappedResult failed.");
return; return;
} }
#else
return;
#endif
} }
totalWritten += written; totalWritten += written;
#if defined QPIPEWRITER_DEBUG #if defined QPIPEWRITER_DEBUG