From be35ba31bfff429330d628b848ecc7d65265590d Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Sat, 6 Jan 2018 20:46:06 +0100
Subject: [PATCH] Fix compilation in monolithic mode

(cherry picked from commit 3aa10c8dbaf4813fb30d6e9487a5d50720c7affd)
---
 src/frontends/qt4/GuiApplication.cpp | 1 +
 src/frontends/qt4/GuiInclude.cpp     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 110b63ec21..323e654a41 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -122,6 +122,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 aa2fc65725..edbf7a19c4 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>
 
-- 
2.39.5