diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-15 17:44:28 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-15 17:44:35 (GMT) |
| commit | ad0f3996a9674def59766726db34191844d2af0a (patch) | |
| tree | d029eeb8b988786a8859f98455e5bc3d9651cb80 /src/gui/util | |
| parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
| parent | 5e47ee6a97f54f1cdac577f76cd338b40e624f32 (diff) | |
| download | Qt-ad0f3996a9674def59766726db34191844d2af0a.zip Qt-ad0f3996a9674def59766726db34191844d2af0a.tar.gz Qt-ad0f3996a9674def59766726db34191844d2af0a.tar.bz2 | |
Merge earth-team into master
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qsystemtrayicon_win.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp index 2b7935b..5a0e179 100644 --- a/src/gui/util/qsystemtrayicon_win.cpp +++ b/src/gui/util/qsystemtrayicon_win.cpp @@ -305,6 +305,7 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result ) case WM_CONTEXTMENU: if (q->contextMenu()) { q->contextMenu()->popup(gpos); + q->contextMenu()->activateWindow(); } emit q->activated(QSystemTrayIcon::Context); break; |