diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:54:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:54:34 -0600 |
| commit | 85e23da660cc38aa36026664631e9effcb53726b (patch) | |
| tree | 5daf0998c4c154b41fc500204e55c97d83534510 /src/kernel/qeventloop_glib_p.h | |
| parent | 67196343e4fac61834c980d6ccd4d9b661e781b6 (diff) | |
| parent | cb6a50aa2564adf03b5ccd87b8ee0e68947d3a61 (diff) | |
| download | tqt3-85e23da660cc38aa36026664631e9effcb53726b.tar.gz tqt3-85e23da660cc38aa36026664631e9effcb53726b.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
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 537406854..225054bf2 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 // TQEVENTLOOP_GLIB_P_H |