diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-07-08 11:17:37 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-07-08 11:17:37 (GMT) |
| commit | f037c0e87d186a01f07cb9aa360dcc496d11145e (patch) | |
| tree | 9449cc65b856b4743e933cf2b8ae1cb2f85ba9fd /src/corelib/io | |
| parent | 5016de08d84c4d2887f7424dbf17f31e27c2e8e2 (diff) | |
| parent | 1dd26ea2486db87b61e8e9f70a1e04f7386405ef (diff) | |
| download | Qt-f037c0e87d186a01f07cb9aa360dcc496d11145e.zip Qt-f037c0e87d186a01f07cb9aa360dcc496d11145e.tar.gz Qt-f037c0e87d186a01f07cb9aa360dcc496d11145e.tar.bz2 | |
Merge remote branch 'upstream/4.8'
Conflicts:
doc/src/external-resources.qdoc
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 4b689c5..e900663 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1683,13 +1683,10 @@ QProcessEnvironment QProcess::processEnvironment() const bool QProcess::waitForStarted(int msecs) { Q_D(QProcess); - if (d->processState == QProcess::Starting) { - if (!d->waitForStarted(msecs)) - return false; - setProcessState(QProcess::Running); - emit started(); - } - return d->processState == QProcess::Running; + if (d->processState == QProcess::Running) + return true; + + return d->waitForStarted(msecs); } /*! \reimp |