summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qguieventdispatcher_glib.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-01-08 11:55:25 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-01-08 11:55:25 (GMT)
commit30d45394f59c25fc2c3e7e30da4e49bf9744de76 (patch)
tree8483a7b767bb36023f90bca39f8512dc11553f22 /src/gui/kernel/qguieventdispatcher_glib.cpp
parentd170179f00effe691de23167e02ff5aeecaeb054 (diff)
parent2e62227f950aac8205f2b67e4d7d046836b2c799 (diff)
downloadQt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.zip
Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.gz
Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.bz2
Merge remote branch 'origin/master'
Diffstat (limited to 'src/gui/kernel/qguieventdispatcher_glib.cpp')
-rw-r--r--src/gui/kernel/qguieventdispatcher_glib.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qguieventdispatcher_glib.cpp b/src/gui/kernel/qguieventdispatcher_glib.cpp
index fc6bc54..475d245 100644
--- a/src/gui/kernel/qguieventdispatcher_glib.cpp
+++ b/src/gui/kernel/qguieventdispatcher_glib.cpp
@@ -152,6 +152,8 @@ static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointe
out:
+ source->d->runTimersOnceWithNormalPriority();
+
if (callback)
callback(user_data);
return true;