diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-17 09:40:52 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-17 09:40:52 (GMT) |
| commit | dd678f7564955112b348a2fec56b29a8875e585e (patch) | |
| tree | d2415d20cb5a27c312150cd6ee93bce8d5129895 /src/gui/kernel/qguieventdispatcher_glib.cpp | |
| parent | 7d6af0213ab4f8797f98d0beb659fcf2f78a361b (diff) | |
| parent | bc01bb10da23d0d2308cf02a16947be836bc9a21 (diff) | |
| download | Qt-dd678f7564955112b348a2fec56b29a8875e585e.zip Qt-dd678f7564955112b348a2fec56b29a8875e585e.tar.gz Qt-dd678f7564955112b348a2fec56b29a8875e585e.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'src/gui/kernel/qguieventdispatcher_glib.cpp')
| -rw-r--r-- | src/gui/kernel/qguieventdispatcher_glib.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qguieventdispatcher_glib.cpp b/src/gui/kernel/qguieventdispatcher_glib.cpp index f8a638c..a252499 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; |