diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:51:14 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:51:14 -0600 |
| commit | 79751823a7e899821a14fd08c673ca0655ca4b51 (patch) | |
| tree | eff23661b954ce94b6cc9bfb63fd99873ec77df9 /src/kernel/qeventloop_glib_p.h | |
| parent | 577ad042c85beec9b04041e4565eac34db57abb0 (diff) | |
| parent | d10d2321a34ab6c157bdf2a2e900c0ee52f1bd79 (diff) | |
| download | qt3-79751823a7e899821a14fd08c673ca0655ca4b51.tar.gz qt3-79751823a7e899821a14fd08c673ca0655ca4b51.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qeventloop_glib_p.h')
| -rw-r--r-- | src/kernel/qeventloop_glib_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/qeventloop_glib_p.h index 663f20e..4dfc02c 100644 --- a/src/kernel/qeventloop_glib_p.h +++ b/src/kernel/qeventloop_glib_p.h @@ -90,6 +90,9 @@ public: xfd = -1; x_gPollFD.fd = -1; #endif // Q_WS_X11 + singletoolkit = TRUE; + ctx = 0; + ctx_is_default = false; reset(); } @@ -99,9 +102,8 @@ public: quitnow = FALSE; exitloop = FALSE; shortcut = FALSE; - singletoolkit = TRUE; } - + int looplevel; int quitcode; unsigned int quitnow : 1; @@ -129,6 +131,7 @@ public: // main context GMainContext *ctx; + bool ctx_is_default; }; #endif // QEVENTLOOP_GLIB_P_H |