diff options
| author | axis <qt-info@nokia.com> | 2011-04-07 11:08:53 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-07 11:08:53 +0200 |
| commit | d54b3f04fa629fe031f1083073eef0145f0d6b1e (patch) | |
| tree | 2a06736f812c478bdb21aa3781078fe88b5532fa /src/corelib/concurrent | |
| parent | 258c1a8537816f7b4c79e7cf4090a333768a10fa (diff) | |
| parent | 8031eada2f81963865390b4d899631b09d4ca6f3 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Conflicts:
src/corelib/thread/qthread_unix.cpp
Diffstat (limited to 'src/corelib/concurrent')
| -rw-r--r-- | src/corelib/concurrent/qfutureinterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qfutureinterface.cpp b/src/corelib/concurrent/qfutureinterface.cpp index 627d0c76de..c5bd802480 100644 --- a/src/corelib/concurrent/qfutureinterface.cpp +++ b/src/corelib/concurrent/qfutureinterface.cpp @@ -219,7 +219,7 @@ QString QFutureInterfaceBase::progressText() const bool QFutureInterfaceBase::isProgressUpdateNeeded() const { QMutexLocker locker(&d->m_mutex); - return (d->progressTime.elapsed() > (1000 / MaxProgressEmitsPerSecond)); + return !d->progressTime.isValid() || (d->progressTime.elapsed() > (1000 / MaxProgressEmitsPerSecond)); } void QFutureInterfaceBase::reportStarted() |