diff options
| author | Philip Van Hoof <philip@codeminded.be> | 2010-11-01 15:59:44 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-11-01 16:01:20 (GMT) |
| commit | aa88b7044dd86850e6986aa80104bb38bb7b12eb (patch) | |
| tree | 4a39b8fb25dc42484680ce48cb00f81331807d56 | |
| parent | f293b98de2b08abf9fe083db9f9a299c87608f35 (diff) | |
| download | Qt-aa88b7044dd86850e6986aa80104bb38bb7b12eb.zip Qt-aa88b7044dd86850e6986aa80104bb38bb7b12eb.tar.gz Qt-aa88b7044dd86850e6986aa80104bb38bb7b12eb.tar.bz2 | |
Push and pop the thread-default context for the current thread
Merge-request: 869
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_glib.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index e5136f9..8d25780 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -313,6 +313,10 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context) } } +#if GLIB_CHECK_VERSION (2, 22, 0) + g_main_context_push_thread_default (mainContext); +#endif + // setup post event source postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs, sizeof(GPostEventSource))); @@ -391,6 +395,9 @@ QEventDispatcherGlib::~QEventDispatcherGlib() d->postEventSource = 0; Q_ASSERT(d->mainContext != 0); +#if GLIB_CHECK_VERSION (2, 22, 0) + g_main_context_pop_thread_default (d->mainContext); +#endif g_main_context_unref(d->mainContext); d->mainContext = 0; } |