diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-07-28 10:17:53 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-07-28 10:17:53 (GMT) |
| commit | 24322b3d6b1e7b33f936081a2dcaa3d62c9b501f (patch) | |
| tree | bfbfa9ff2086da616674034ec4dff2b28f60cee0 | |
| parent | e7c239407698f2a5d4f4b4000ecdd5969025fe1c (diff) | |
| download | Qt-24322b3d6b1e7b33f936081a2dcaa3d62c9b501f.zip Qt-24322b3d6b1e7b33f936081a2dcaa3d62c9b501f.tar.gz Qt-24322b3d6b1e7b33f936081a2dcaa3d62c9b501f.tar.bz2 | |
Fix so that eventloop intgration can have 0 timeouts
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_qpa.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface_qpa.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp index 4464036..cb70141 100644 --- a/src/gui/kernel/qeventdispatcher_qpa.cpp +++ b/src/gui/kernel/qeventdispatcher_qpa.cpp @@ -255,7 +255,9 @@ int QEventDispatcherQPA::select(int nfds, fd_set *readfds, fd_set *writefds, fd_ Q_D(QEventDispatcherQPA); int retVal = 0; if (d->hasIntegration()) { - qint64 timeoutmsec = timeout->tv_sec * 1000 + (timeout->tv_usec/1000); + qint64 timeoutmsec = 0; + if (timeout) + timeoutmsec = timeout->tv_sec * 1000 + (timeout->tv_usec/1000); d->selectReturnMutex->lock(); if (d->selectWorkerNeedsSync) { if (d->selectWorkerHasResult) { diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.h b/src/gui/kernel/qwindowsysteminterface_qpa.h index e57fa8e..5ff4275 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.h +++ b/src/gui/kernel/qwindowsysteminterface_qpa.h @@ -79,7 +79,6 @@ public: static void handleTouchEvent(QWidget *w, QEvent::Type type, QTouchEvent::DeviceType devType, const QList<struct TouchPoint> &points); static void handleTouchEvent(QWidget *w, ulong timestamp, QEvent::Type type, QTouchEvent::DeviceType devType, const QList<struct TouchPoint> &points); - // delivered directly by the plugin via spontaneous events static void handleGeometryChange(QWidget *w, const QRect &newRect); static void handleCloseEvent(QWidget *w); static void handleEnterEvent(QWidget *w); |