diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 23:31:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 23:31:29 (GMT) |
| commit | c0f5eeec92f188381d7f085b2d4f5ea08ecc665c (patch) | |
| tree | af8e77d9c9fd297fd0bc35aa2369fadd3a6bdcde /src/corelib | |
| parent | 7884b913c006402eded0bfe36053c9c557d8d9d6 (diff) | |
| parent | 45c4c792c48605de4cbc28637a39bce5a65b1613 (diff) | |
| download | Qt-c0f5eeec92f188381d7f085b2d4f5ea08ecc665c.zip Qt-c0f5eeec92f188381d7f085b2d4f5ea08ecc665c.tar.gz Qt-c0f5eeec92f188381d7f085b2d4f5ea08ecc665c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update changes for 4.7.3
directfb: avoid version dependency by setting DSPD_DST blend functions manually
fix -enable-stdcall-fixup usage
Report that an update is needed if no update was done
Diffstat (limited to 'src/corelib')
| -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 627d0c7..c5bd802 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() |