diff options
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 21 | ||||
| -rw-r--r-- | src/corelib/io/qprocess.h | 4 |
2 files changed, 1 insertions, 24 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 1c7ea36105..8b35836584 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1623,25 +1623,6 @@ void QProcess::setWorkingDirectory(const QString &dir) d->workingDirectory = dir; } -#if QT_DEPRECATED_SINCE(5, 15) -/*! - \deprecated - Use processId() instead. - - Returns the native process identifier for the running process, if - available. If no process is currently running, \c 0 is returned. - - \note Unlike \l processId(), pid() returns an integer on Unix and a pointer on Windows. - - \sa Q_PID, processId() -*/ -Q_PID QProcess::pid() const // ### Qt 6 remove or rename this method to processInformation() -{ - Q_D(const QProcess); - return d->pid; -} -#endif - /*! \since 5.3 @@ -2552,7 +2533,7 @@ QString QProcess::nullDevice() platform. On Unix, this corresponds to \l qint64; on Windows, it corresponds to \c{_PROCESS_INFORMATION*}. - \sa QProcess::pid() + \sa QProcess::processId() */ #endif // QT_CONFIG(process) diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 101bfcc384..4a24f7576f 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -222,10 +222,6 @@ public: QProcess::ProcessError error() const; QProcess::ProcessState state() const; -#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); |