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

QProcess/Unix: remove dead function

Browse Source 
findExitCode() doesn't do anything on Unix.

Change-Id: I3efdc1380a39437c4c029073f3b10ccf7a65e580
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Alex Trotsenko 2021-01-28 20:47:50 +02:00
parent f2c3b52c6c
commit f9896cb3cd
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/io/qprocess.cpp
View File

@ -1152,8 +1152,9 @@ void QProcessPrivate::processFinished()
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
waitForDeadChild(); waitForDeadChild();
#endif #else
findExitCode(); findExitCode();
#endif
cleanup(); cleanup();
@ -1196,7 +1197,6 @@ bool QProcessPrivate::_q_startupNotification()
setErrorAndEmit(QProcess::FailedToStart, errorMessage); setErrorAndEmit(QProcess::FailedToStart, errorMessage);
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
waitForDeadChild(); waitForDeadChild();
findExitCode();
#endif #endif
cleanup(); cleanup();
return false; return false;
@ -1245,9 +1245,6 @@ QProcess::~QProcess()
kill(); kill();
waitForFinished(); waitForFinished();
} }
#ifdef Q_OS_UNIX
d->findExitCode();
#endif
d->cleanup(); d->cleanup();
} }

3
src/corelib/io/qprocess_p.h
View File

@ -356,9 +356,10 @@ public:
void processFinished(); void processFinished();
void terminateProcess(); void terminateProcess();
void killProcess(); void killProcess();
void findExitCode();
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
void waitForDeadChild(); void waitForDeadChild();
#else
void findExitCode();
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
STARTUPINFOW createStartupInfo(); STARTUPINFOW createStartupInfo();

4
src/corelib/io/qprocess_unix.cpp
View File

@ -853,10 +853,6 @@ bool QProcessPrivate::waitForFinished(const QDeadlineTimer &deadline)
return false; return false;
} }
void QProcessPrivate::findExitCode()
{
}
void QProcessPrivate::waitForDeadChild() void QProcessPrivate::waitForDeadChild()
{ {
Q_ASSERT(forkfd != -1); Q_ASSERT(forkfd != -1);