correct OR when checking modifiers

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34974 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 1e87434ad1a0c2a12b536a9e522bef6d6d010a52..a9fdf16ed6383faf5e863dbc5dc3d54e7a844734 100644 (file)
--- 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;