diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-07 11:37:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-07 11:37:35 (GMT) |
| commit | 233a146ae575de76e55abe2dc30bcde3b5570f23 (patch) | |
| tree | d814d3d74c42815cf981ac0a5d82d18d0f48f6e2 /src/corelib | |
| parent | 016710570869decb8cf8b2dc6b6584c4a9a07b80 (diff) | |
| parent | 999047177846695a809aa1a730330ce676d85959 (diff) | |
| download | Qt-233a146ae575de76e55abe2dc30bcde3b5570f23.zip Qt-233a146ae575de76e55abe2dc30bcde3b5570f23.tar.gz Qt-233a146ae575de76e55abe2dc30bcde3b5570f23.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix QProcess emitting two started signals on X11
Diffstat (limited to 'src/corelib')
| -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 |