diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:35 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:35 -0500 |
| commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
| tree | 3de07468347367bdef8e6c0d765bdb209585a189 /src/widgets/qmainwindow.cpp | |
| parent | da067173fd2ab6bca5943294a439c4992323227a (diff) | |
| parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
| download | qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
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 7ad2781..8574866 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -1626,7 +1626,7 @@ bool QMainWindow::eventFilter( QObject* o, QEvent *e ) setUpLayout(); d->tll->activate(); } else if ( e->type() == QEvent::ContextMenu && d->dockMenu && - ( ::qt_cast<QDockArea*>(o) && dockMainWindow( o ) || o == d->hideDock || o == d->mb ) ) { + ( ( ::qt_cast<QDockArea*>(o) && dockMainWindow( o ) ) || o == d->hideDock || o == d->mb ) ) { if ( showDockMenu( ( (QMouseEvent*)e )->globalPos() ) ) { ( (QContextMenuEvent*)e )->accept(); return TRUE; |