From 0498aa1dcb2a2702465a8fe9550119f9e26e929b Mon Sep 17 00:00:00 2001
From: Stephan Witt <switt@lyx.org>
Date: Sun, 18 Jul 2010 12:18:22 +0000
Subject: [PATCH] correct OR when checking modifiers

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34974 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiWorkArea.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 1e87434ad1..a9fdf16ed6 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -821,15 +821,15 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev)
 	switch (lyxrc.scroll_whell_zoom) {
 	case LyXRC::SCROLL_WHEEL_ZOOM_CTRL:
 		zoom = ev->modifiers() & Qt::ControlModifier;
-		zoom &= !(ev->modifiers() & (Qt::ShiftModifier || Qt::AltModifier));
+		zoom &= !(ev->modifiers() & (Qt::ShiftModifier | Qt::AltModifier));
 		break;
 	case LyXRC::SCROLL_WHEEL_ZOOM_SHIFT:
 		zoom = ev->modifiers() & Qt::ShiftModifier;
-		zoom &= !(ev->modifiers() & (Qt::ControlModifier || Qt::AltModifier));
+		zoom &= !(ev->modifiers() & (Qt::ControlModifier | Qt::AltModifier));
 		break;
 	case LyXRC::SCROLL_WHEEL_ZOOM_ALT:
 		zoom = ev->modifiers() & Qt::AltModifier;
-		zoom &= !(ev->modifiers() & (Qt::ShiftModifier || Qt::ControlModifier));
+		zoom &= !(ev->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier));
 		break;
 	case LyXRC::SCROLL_WHEEL_ZOOM_OFF:
 		break;