diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
| commit | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (patch) | |
| tree | 231f5c31f279d3e798702fe61e9b6bcef52b089b /src/widgets/qmainwindow.cpp | |
| parent | 6d0157ea558089bb957f35263424a405e42a6931 (diff) | |
| parent | fe7969ef886d7287fa959929ddd33fbad8407884 (diff) | |
| download | tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.tar.gz tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/widgets/qmainwindow.cpp')
| -rw-r--r-- | src/widgets/qmainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index 830e3f0dc..f2069485d 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -1626,7 +1626,7 @@ bool TQMainWindow::eventFilter( TQObject* o, TQEvent *e ) setUpLayout(); d->tll->activate(); } else if ( e->type() == TQEvent::ContextMenu && d->dockMenu && - ( ::tqt_cast<TQDockArea*>(o) && dockMainWindow( o ) || o == d->hideDock || o == d->mb ) ) { + ( ( ::tqt_cast<TQDockArea*>(o) && dockMainWindow( o ) ) || o == d->hideDock || o == d->mb ) ) { if ( showDockMenu( ( (TQMouseEvent*)e )->globalPos() ) ) { ( (TQContextMenuEvent*)e )->accept(); return TRUE; |