diff options
| author | Timothy Pearson <[email protected]> | 2012-12-09 16:33:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-12-09 16:33:47 -0600 |
| commit | 72eba91414074b25fe9cd227a3fc6fe0dc612bf4 (patch) | |
| tree | 118279b027acc0686a0b1a7e57b92a8fc746e935 /src/kernel/qeventloop_glib_p.h | |
| parent | a7865cf6918fc3457d0141522e791a92bcf62810 (diff) | |
| download | qt3-72eba91414074b25fe9cd227a3fc6fe0dc612bf4.tar.gz qt3-72eba91414074b25fe9cd227a3fc6fe0dc612bf4.zip | |
Fix X11 fd polling initialization in glib main loop
This resolves Bug 1358
Diffstat (limited to 'src/kernel/qeventloop_glib_p.h')
| -rw-r--r-- | src/kernel/qeventloop_glib_p.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/qeventloop_glib_p.h index ef0e6ac..663f20e 100644 --- a/src/kernel/qeventloop_glib_p.h +++ b/src/kernel/qeventloop_glib_p.h @@ -86,6 +86,10 @@ class QEventLoopPrivate public: QEventLoopPrivate() { +#if defined(Q_WS_X11) + xfd = -1; + x_gPollFD.fd = -1; +#endif // Q_WS_X11 reset(); } @@ -106,9 +110,7 @@ public: #if defined(Q_WS_X11) int xfd; - - GPollFD x_gPollFD; - + GPollFD x_gPollFD; #endif // Q_WS_X11 int thread_pipe[2]; @@ -119,7 +121,7 @@ public: QPtrList<QSockNotGPollFD> sn_pending_list; // store flags for one iteration - uint pev_flags; + uint pev_flags; // My GSource GSource * gSource; |