diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
| commit | 30fd22b9574def54726e7b193127cc0c901c1b4c (patch) | |
| tree | 96dfc923044db0515064ba39d052d9ed577e3e40 /src/corelib/io/qprocess.h | |
| parent | d7b0581c1c2ef60c08d238dae39298af6904918f (diff) | |
| parent | 6aa09bbce59828d028f6d1e81d2bfc6ba537aae1 (diff) | |
Merge remote-tracking branch 'origin/dev' into stable
Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88
Diffstat (limited to 'src/corelib/io/qprocess.h')
| -rw-r--r-- | src/corelib/io/qprocess.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index c0b3ab945e..6be267f15f 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -187,6 +187,7 @@ public: // #### Qt 5: Q_PID is a pointer on Windows and a value on Unix Q_PID pid() const; + qint64 processId() const; bool waitForStarted(int msecs = 30000); bool waitForReadyRead(int msecs = 30000); |