Author: lasgouttes
Date: Fri Jun 4 23:59:55 2010
New Revision: 34592
URL: http://www.lyx.org/trac/changeset/34592
Log:
fix compilation on fedora13 and binutils/gold by removing some really
X11-specific code
Modified:
lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiWorkArea.cpp
lyx-devel/branches/BRANCH_1_6_X/status.16x
Modified: lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiWorkArea.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiWorkArea.cpp Fri Jun
4 23:50:08 2010 (r34591)
+++ lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiWorkArea.cpp Fri Jun
4 23:59:55 2010 (r34592)
@@ -72,11 +72,6 @@
#include <cmath>
-#ifdef Q_WS_X11
-#include <QX11Info>
-extern "C" int XEventsQueued(Display *display, int mode);
-#endif
-
#ifdef Q_WS_WIN
int const CursorWidth = 2;
#else
@@ -845,11 +840,10 @@
// 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;
}
Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/status.16x Fri Jun 4 23:50:08 2010
(r34591)
+++ lyx-devel/branches/BRANCH_1_6_X/status.16x Fri Jun 4 23:59:55 2010
(r34592)
@@ -130,6 +130,8 @@
* BUILD/INSTALLATION
+- Fix building with Fedora 13 and potentially other new linux distribution.
+
- CMake: Installs all but the binaries into the 'Resource' folder
