if (str == "Escape") return Qt::Key_Escape;
if (str == "Tab") return Qt::Key_Tab;
- if (str == "ISO_Left_Tab") return Qt::Key_Tab;
+ if (str == "ISO_Left_Tab") return Qt::Key_Backtab;
if (str == "BackSpace") return Qt::Key_Backspace;
if (str == "Return") return Qt::Key_Return;
if (str == "KP_Enter") return Qt::Key_Enter; // correct ?
if (str == "yacute") return Qt::Key_Yacute;
if (str == "thorn") return Qt::Key_THORN;
if (str == "ydiaeresis") return Qt::Key_ydiaeresis;
+ if (str == "Dead_Caron") return Qt::Key_Dead_Caron;
// FIXME, correct for all these ?
if (str == "Super_L") return Qt::Key_Super_L;
case Qt::Key_ssharp: return "ssharp";
case Qt::Key_ydiaeresis: return "ydiaeresis";
case Qt::Key_Bar: return "bar";
+ case Qt::Key_Dead_Caron: return "Dead_Caron";
// FIXME: these ones I don't know the names of ... help !
// what's here is basically guesses ...
return 0;
// UTF16 has a maximum of two characters.
- LASSERT(text_.size() <= 2, /**/);
+ LASSERT(text_.size() <= 2, return 0);
if (lyxerr.debugging() && text_.size() > 1) {
// We don't know yet how well support the full ucs4 range.
if (forgui)
str = seq.toString(QKeySequence::NativeText);
else {
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
// Qt/Mac does not use Command and friends in the
// portable case, but the windows-like Control+x (bug 5421).
str = seq.toString(QKeySequence::NativeText);
k |= ShiftModifier;
if (state & Qt::AltModifier)
k |= AltModifier;
-#ifdef USE_MACOSX_PACKAGING || defined(USE_META_KEYBINDING)
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
if (state & Qt::MetaModifier)
k |= MetaModifier;
#else