summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@nokia.com>2011-08-26 08:20:41 (GMT)
committerEike Ziller <eike.ziller@nokia.com>2011-08-29 07:22:53 (GMT)
commitcf5286eca4b8d35ca1f8344ebbdd88c1511705c3 (patch)
tree14b8c04673fd22e652a8941e3e9d181fde1a7fb3 /src/gui/kernel
parent41da349eb2bf25dba633578068b9bf2a7e7a6e24 (diff)
downloadQt-cf5286eca4b8d35ca1f8344ebbdd88c1511705c3.zip
Qt-cf5286eca4b8d35ca1f8344ebbdd88c1511705c3.tar.gz
Qt-cf5286eca4b8d35ca1f8344ebbdd88c1511705c3.tar.bz2
QPA event loop: Set a timeout != 0 if there are no timers.
Leaving it at 0 leads to event checking with 100% CPU even though we know that there are no events. Acknowledged-by: jlind
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qeventdispatcher_qpa.cpp2
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();