From 6034c0e46f54a01bd248b05ad1491793a0840f7e Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 4 Jun 2010 21:59:55 +0000 Subject: [PATCH] fix compilation on fedora13 and binutils/gold by removing some really X11-specific code git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34592 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiWorkArea.cpp | 12 +++--------- status.16x | 2 ++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index ccec8490ca..ce0ad4792b 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -72,11 +72,6 @@ #include -#ifdef Q_WS_X11 -#include -extern "C" int XEventsQueued(Display *display, int mode); -#endif - #ifdef Q_WS_WIN int const CursorWidth = 2; #else @@ -845,11 +840,10 @@ void GuiWorkArea::keyPressEvent(QKeyEvent * ev) // do nothing if there are other events // (the auto repeated events come too fast) - // \todo FIXME: remove hard coded Qt keys, process the key binding + // it looks like this is only needed on X11 #ifdef Q_WS_X11 - if (XEventsQueued(QX11Info::display(), 0) > 1 && ev->isAutoRepeat() - && (Qt::Key_PageDown || Qt::Key_PageUp)) { - LYXERR(Debug::KEY, "system is busy: scroll key event ignored"); + if (qApp->hasPendingEvents() && ev->isAutoRepeat()) { + LYXERR(Debug::KEY, "system is busy: keyPress event ignored"); ev->ignore(); return; } diff --git a/status.16x b/status.16x index 465161dde0..19d9382c8c 100644 --- a/status.16x +++ b/status.16x @@ -130,6 +130,8 @@ What's new * BUILD/INSTALLATION +- Fix building with Fedora 13 and potentially other new linux distribution. + - CMake: Installs all but the binaries into the 'Resource' folder