]> git.lyx.org Git - features.git/commitdiff
#7292 revert the use MetaModifier for AltModifier on mac - we have to look for a...
authorStephan Witt <switt@lyx.org>
Thu, 17 Feb 2011 07:49:16 +0000 (07:49 +0000)
committerStephan Witt <switt@lyx.org>
Thu, 17 Feb 2011 07:49:16 +0000 (07:49 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37707 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/GuiKeySymbol.cpp

index 870d269d520156acb491c3b05300da014f10d1f5..1a945c08a6dc740c6b144dc9be668e73ced9a701 100644 (file)
@@ -691,13 +691,8 @@ docstring const KeySymbol::print(KeyModifier mod, bool forgui) const
                tmpkey += Qt::ShiftModifier;
        if (mod & ControlModifier)
                tmpkey += Qt::ControlModifier;
-#ifdef Q_WS_MACX
-       if (mod & AltModifier)
-               tmpkey += Qt::MetaModifier;
-#else
        if (mod & AltModifier)
                tmpkey += Qt::AltModifier;
-#endif
 
        QKeySequence seq(tmpkey);
        QString str;
@@ -749,13 +744,8 @@ KeyModifier q_key_state(Qt::KeyboardModifiers state)
                k |= ControlModifier;
        if (state & Qt::ShiftModifier)
                k |= ShiftModifier;
-#ifdef Q_WS_MACX
-       if (state & Qt::MetaModifier)
-               k |= AltModifier;
-#else
        if (state & Qt::AltModifier || state & Qt::MetaModifier)
                k |= AltModifier;
-#endif
        return k;
 }