From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Sat, 6 Jan 2018 19:46:06 +0000 (+0100)
Subject: Fix compilation in monolithic mode
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~4057
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3aa10c8dbaf4813fb30d6e9487a5d50720c7affd;p=features.git

Fix compilation in monolithic mode
---

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index b53126fdf2..b2a67dce05 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -118,6 +118,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <QX11Info>
+#undef CursorShape
 #undef None
 #elif defined(QPA_XCB)
 #include <xcb/xcb.h>
diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 4cae710d61..8e7a57c5b3 100644
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -31,9 +31,9 @@
 #include "insets/InsetListingsParams.h"
 #include "insets/InsetInclude.h"
 
-#include <QPushButton>
 #include <QCheckBox>
 #include <QLineEdit>
+#include <QPushButton>
 
 #include <utility>