diff options
| author | aavit <qt-info@nokia.com> | 2011-08-30 07:02:21 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-08-30 07:02:21 (GMT) |
| commit | a556dbe116449f5bb632c102282df7f868efafb4 (patch) | |
| tree | 2baea29fba0e05ad8749a60390dfa4123ff8d727 /src/gui/kernel | |
| parent | 78c5825cfb7702350636b7624bf79311dbd0dbd5 (diff) | |
| parent | cf5286eca4b8d35ca1f8344ebbdd88c1511705c3 (diff) | |
| download | Qt-a556dbe116449f5bb632c102282df7f868efafb4.zip Qt-a556dbe116449f5bb632c102282df7f868efafb4.tar.gz Qt-a556dbe116449f5bb632c102282df7f868efafb4.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
Diffstat (limited to 'src/gui/kernel')
| -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(); |