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

Properly deprecate QProcess::pid

Browse Source 
Address an old ### Qt 5 comment. The method has been documented as deprecated
and replaced by QProcess::processId since at least Qt 5.9, so we can first
properly flag it as such for 5.15.2, and remove it from Qt 6 in a follow-up
commit.

Change-Id: Ic4e3351740617083b16723db8eef7a341bccfbf6
Pick-to: 5.15
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Volker Hilsheimer 2020-09-30 22:37:43 +02:00
parent 8f74f7d25b
commit 3fb8f9e44e
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1623,7 +1623,7 @@ void QProcess::setWorkingDirectory(const QString &dir)
d->workingDirectory = dir; d->workingDirectory = dir;
} }
#if QT_DEPRECATED_SINCE(5, 15)
/*! /*!
\deprecated \deprecated
Use processId() instead. Use processId() instead.
@ -1640,6 +1640,7 @@ Q_PID QProcess::pid() const // ### Qt 6 remove or rename this method to processI
Q_D(const QProcess); Q_D(const QProcess);
return d->pid; return d->pid;
} }
#endif
/*! /*!
\since 5.3 \since 5.3

4
src/corelib/io/qprocess.h
View File

@ -222,8 +222,10 @@ public:
QProcess::ProcessError error() const; QProcess::ProcessError error() const;
QProcess::ProcessState state() const; QProcess::ProcessState state() const;
// #### Qt 5: Q_PID is a pointer on Windows and a value on Unix #if QT_DEPRECATED_SINCE(5, 15)
QT_DEPRECATED_VERSION_X_5_15("Use processId() instead")
Q_PID pid() const; Q_PID pid() const;
#endif
qint64 processId() const; qint64 processId() const;
bool waitForStarted(int msecs = 30000); bool waitForStarted(int msecs = 30000);

2
src/testlib/qbenchmarkvalgrind.cpp
View File

@ -187,7 +187,7 @@ bool QBenchmarkValgrindUtils::runCallgrindSubProcess(const QStringList &origAppA
process.start(QLatin1String("valgrind"), args); process.start(QLatin1String("valgrind"), args);
process.waitForStarted(-1); process.waitForStarted(-1);
QBenchmarkGlobalData::current->callgrindOutFileBase = QBenchmarkGlobalData::current->callgrindOutFileBase =
QBenchmarkValgrindUtils::outFileBase(process.pid()); QBenchmarkValgrindUtils::outFileBase(process.processId());
const bool finishedOk = process.waitForFinished(-1); const bool finishedOk = process.waitForFinished(-1);
exitCode = process.exitCode(); exitCode = process.exitCode();

2
tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
View File

@ -328,7 +328,7 @@ void tst_QLockFile::staleShortLockFromBusyProcess()
QString hostname, appname; QString hostname, appname;
QTRY_VERIFY(secondLock.getLockInfo(&pid, &hostname, &appname)); QTRY_VERIFY(secondLock.getLockInfo(&pid, &hostname, &appname));
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
QCOMPARE(pid, proc.pid()); QCOMPARE(pid, proc.processId());
#endif #endif
secondLock.setStaleLockTime(100); secondLock.setStaleLockTime(100);

2
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
View File

@ -216,7 +216,7 @@ void tst_QProcess::constructing()
QCOMPARE(process.environment(), QStringList()); QCOMPARE(process.environment(), QStringList());
QCOMPARE(process.error(), QProcess::UnknownError); QCOMPARE(process.error(), QProcess::UnknownError);
QCOMPARE(process.state(), QProcess::NotRunning); QCOMPARE(process.state(), QProcess::NotRunning);
QCOMPARE(process.pid(), Q_PID(0)); QCOMPARE(process.processId(), 0);
QCOMPARE(process.readAllStandardOutput(), QByteArray()); QCOMPARE(process.readAllStandardOutput(), QByteArray());
QCOMPARE(process.readAllStandardError(), QByteArray()); QCOMPARE(process.readAllStandardError(), QByteArray());
QCOMPARE(process.canReadLine(), false); QCOMPARE(process.canReadLine(), false);