diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 21:39:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 21:39:15 (GMT) |
| commit | 7474ad656269aec1352d166bb5a4435086d48482 (patch) | |
| tree | 2791036aa8644ab759dc81eb7317de78589026a9 /src/gui/util | |
| parent | 7a413f40f8db4f20277f153c1e771da478a5e991 (diff) | |
| parent | 5762a988fbcd95c9c44e58993c25f5cd1d53f897 (diff) | |
| download | Qt-7474ad656269aec1352d166bb5a4435086d48482.zip Qt-7474ad656269aec1352d166bb5a4435086d48482.tar.gz Qt-7474ad656269aec1352d166bb5a4435086d48482.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use a shared QScriptEngine for debugger console command scripts
Fix QtScript debugger hang/crash issue with updating locals model
doc: Fixed some qdoc warnings.
Always activate popup windows on show
doc: Fixed some qdoc warnings.
Add the QMAKE_FILE_EXT variable to extra compilers generation.
Cocoa: Tool Windows steal focus from the main window
qdoc3: Removed a debug output.
Update QTestLib documentation with chart use case.
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qsystemtrayicon_win.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp index 092909f..8e482e0 100644 --- a/src/gui/util/qsystemtrayicon_win.cpp +++ b/src/gui/util/qsystemtrayicon_win.cpp @@ -325,8 +325,6 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result ) q->contextMenu()->move(gpos); } #endif - q->contextMenu()->activateWindow(); - //Must be activated for proper keyboardfocus and menu closing on windows: } emit q->activated(QSystemTrayIcon::Context); break; |