Remove deprecated QProcess::pid
Change-Id: I6bce5b374a9e22f0a3d67755dbd0f8e14458ce3b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>bb10
parent
3fb8f9e44e
commit
0f8848b7e2
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue