From 5ae82a06c308960c66757b0a956500b05b83f002 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 28 Jul 2012 15:50:52 -0500 Subject: Fix build warnings Thanks to Bruce Sass for the patch! (cherry picked from commit ebcb1d80bf517aceb69778e1e9f67e5f4da8c484) --- src/widgets/qpopupmenu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widgets/qpopupmenu.cpp') diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index 9e1e01c..f20cbfc 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -652,19 +652,19 @@ void QPopupMenu::popup( const QPoint &pos, int indexAtPoint ) int hGuess = qApp->reverseLayout() ? QEffects::LeftScroll : QEffects::RightScroll; int vGuess = QEffects::DownScroll; if ( qApp->reverseLayout() ) { - if ( snapToMouse && ( x + w/2 > mouse.x() ) || + if ( ( snapToMouse && ( x + w/2 > mouse.x() ) ) || ( parentMenu && parentMenu->isPopupMenu && ( x + w/2 > ((QPopupMenu*)parentMenu)->x() ) ) ) hGuess = QEffects::RightScroll; } else { - if ( snapToMouse && ( x + w/2 < mouse.x() ) || + if ( ( snapToMouse && ( x + w/2 < mouse.x() ) ) || ( parentMenu && parentMenu->isPopupMenu && ( x + w/2 < ((QPopupMenu*)parentMenu)->x() ) ) ) hGuess = QEffects::LeftScroll; } #ifndef QT_NO_MENUBAR - if ( snapToMouse && ( y + h/2 < mouse.y() ) || + if ( ( snapToMouse && ( y + h/2 < mouse.y() ) ) || ( parentMenu && parentMenu->isMenuBar && ( y + h/2 < ((QMenuBar*)parentMenu)->mapToGlobal( ((QMenuBar*)parentMenu)->pos() ).y() ) ) ) vGuess = QEffects::UpScroll; -- cgit v1.2.1