diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-29 07:33:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-29 07:33:23 (GMT) |
| commit | 0c552cce7a03d1bcd49e5716b9e2cf4f44b8d5f7 (patch) | |
| tree | 14b8c04673fd22e652a8941e3e9d181fde1a7fb3 | |
| parent | c97240bbd0be57889f37b93aa022a6dec84da013 (diff) | |
| parent | cf5286eca4b8d35ca1f8344ebbdd88c1511705c3 (diff) | |
| download | Qt-0c552cce7a03d1bcd49e5716b9e2cf4f44b8d5f7.zip Qt-0c552cce7a03d1bcd49e5716b9e2cf4f44b8d5f7.tar.gz Qt-0c552cce7a03d1bcd49e5716b9e2cf4f44b8d5f7.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
QPA event loop: Set a timeout != 0 if there are no timers.
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_qpa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp index 200696d..3f2e8b2 100644 --- a/src/gui/kernel/qeventdispatcher_qpa.cpp +++ b/src/gui/kernel/qeventdispatcher_qpa.cpp @@ -284,7 +284,7 @@ int QEventDispatcherQPA::select(int nfds, fd_set *readfds, fd_set *writefds, fd_ Q_D(QEventDispatcherQPA); int retVal = 0; if (d->hasIntegration()) { - qint64 timeoutmsec = 0; + qint64 timeoutmsec = 1000; // wait a second if we don't have timers if (timeout) timeoutmsec = timeout->tv_sec * 1000 + (timeout->tv_usec/1000); d->selectReturnMutex->lock(); |