diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-30 22:37:43 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-01 04:55:47 +0200 |
| commit | 3fb8f9e44e8cbf5937257505d0bc2d1457a26da1 (patch) | |
| tree | c8f3e05e2bfc15b3143abc20bf97437b014f0c61 /tests/auto/corelib/io | |
| parent | 8f74f7d25b62979d2d8a458cdeb282184b64d8d9 (diff) | |
Properly deprecate QProcess::pid
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>
Diffstat (limited to 'tests/auto/corelib/io')
| -rw-r--r-- | tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp index 42bdf3eabf..708716e7e2 100644 --- a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp +++ b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp @@ -328,7 +328,7 @@ void tst_QLockFile::staleShortLockFromBusyProcess() QString hostname, appname; QTRY_VERIFY(secondLock.getLockInfo(&pid, &hostname, &appname)); #ifdef Q_OS_UNIX - QCOMPARE(pid, proc.pid()); + QCOMPARE(pid, proc.processId()); #endif secondLock.setStaleLockTime(100); diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 1570bb9977..7703e91e37 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -216,7 +216,7 @@ void tst_QProcess::constructing() QCOMPARE(process.environment(), QStringList()); QCOMPARE(process.error(), QProcess::UnknownError); QCOMPARE(process.state(), QProcess::NotRunning); - QCOMPARE(process.pid(), Q_PID(0)); + QCOMPARE(process.processId(), 0); QCOMPARE(process.readAllStandardOutput(), QByteArray()); QCOMPARE(process.readAllStandardError(), QByteArray()); QCOMPARE(process.canReadLine(), false); |