diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-16 16:02:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-16 16:02:19 +0200 |
| commit | e72785547696146f6172f0ef2824033e17df7b50 (patch) | |
| tree | e78d6bafd7b3bcd9e786b5da8150cf02dcf2b4bb /src/corelib/io/qprocess.cpp | |
| parent | ac5c64fccd6d491ee3b3a3f54460ed3464d714fc (diff) | |
| parent | 5c23199d4e8ff21661dfa5aacc13149178e78cab (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 1be108d0a7..96cec568df 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1691,10 +1691,10 @@ QProcessEnvironment QProcess::processEnvironment() const bool QProcess::waitForStarted(int msecs) { Q_D(QProcess); - if (d->processState == QProcess::Running) - return true; + if (d->processState == QProcess::Starting) + return d->waitForStarted(msecs); - return d->waitForStarted(msecs); + return d->processState == QProcess::Running; } /*! \reimp |