--- a/src/gui/util/qsystemtrayicon_win.cpp Wed Jun 23 19:07:03 2010 +0300
+++ b/src/gui/util/qsystemtrayicon_win.cpp Tue Jul 06 15:10:48 2010 +0300
@@ -53,7 +53,6 @@
#include <qt_windows.h>
#include <commctrl.h>
-#include <shlwapi.h>
#include <QBitmap>
#include <QLibrary>
#include <QApplication>
@@ -301,8 +300,6 @@
case WM_RBUTTONUP:
if (q->contextMenu()) {
q->contextMenu()->popup(gpos);
- q->contextMenu()->activateWindow();
- //Must be activated for proper keyboardfocus and menu closing on windows:
}
emit q->activated(QSystemTrayIcon::Context);
break;