diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-23 16:06:00 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-23 16:06:00 (GMT) |
| commit | 2bfde77e07c1de1866a1d171fc5dc5c584618e8e (patch) | |
| tree | a38ead931add61ba1b8dbb2eb0ad495a59aaf35f /src/corelib/kernel | |
| parent | ec2d71f0e4af0e0c286f0027d0242f456fdb2bb6 (diff) | |
| parent | 5423ba187c62ea861ccfcc013fb15fcc4a5ae28d (diff) | |
| download | Qt-2bfde77e07c1de1866a1d171fc5dc5c584618e8e.zip Qt-2bfde77e07c1de1866a1d171fc5dc5c584618e8e.tar.gz Qt-2bfde77e07c1de1866a1d171fc5dc5c584618e8e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_glib.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventloop.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index 3fd768a..3c5b277 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -42,6 +42,7 @@ #include "qeventdispatcher_glib_p.h" #include "qeventdispatcher_unix_p.h" +#include <private/qmutexpool_p.h> #include <private/qthread_p.h> #include "qcoreapplication.h" @@ -224,6 +225,8 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context) : mainContext(context) { if (qgetenv("QT_NO_THREADED_GLIB").isEmpty()) { + static int dummyValue = 0; // only used for its address + QMutexLocker locker(QMutexPool::instance()->get(&dummyValue)); if (!g_thread_supported()) g_thread_init(NULL); } diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp index 92bdf73..600f787 100644 --- a/src/corelib/kernel/qeventloop.cpp +++ b/src/corelib/kernel/qeventloop.cpp @@ -188,8 +188,9 @@ int QEventLoop::exec(ProcessEventsFlags flags) d->threadData->eventLoops.push(this); // remove posted quit events when entering a new event loop - if (qApp->thread() == thread()) - QCoreApplication::removePostedEvents(qApp, QEvent::Quit); + QCoreApplication *app = QCoreApplication::instance(); + if (app && app->thread() == thread()) + QCoreApplication::removePostedEvents(app, QEvent::Quit); #if defined(QT_NO_EXCEPTIONS) while (!d->exit) |