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 /src/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 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/io/qprocess.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 00b5cb9df6..1c7ea36105 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1623,7 +1623,7 @@ void QProcess::setWorkingDirectory(const QString &dir) d->workingDirectory = dir; } - +#if QT_DEPRECATED_SINCE(5, 15) /*! \deprecated 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); return d->pid; } +#endif /*! \since 5.3 diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 541086e1b0..101bfcc384 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -222,8 +222,10 @@ public: QProcess::ProcessError error() 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; +#endif qint64 processId() const; bool waitForStarted(int msecs = 30000); |