]> git.lyx.org Git - features.git/commitdiff
Fix compilation in monolithic mode
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Sat, 6 Jan 2018 19:46:06 +0000 (20:46 +0100)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Sat, 6 Jan 2018 19:46:06 +0000 (20:46 +0100)
src/frontends/qt4/GuiApplication.cpp
src/frontends/qt4/GuiInclude.cpp

index b53126fdf22e8e41e9fb0ad92c256a2463b8734a..b2a67dce05d05d5833a69f2cb0d2566c6202b92d 100644 (file)
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <QX11Info>
+#undef CursorShape
 #undef None
 #elif defined(QPA_XCB)
 #include <xcb/xcb.h>
index 4cae710d618a805eab1239be9794593129bec487..8e7a57c5b389ed6397aa646d5ef1120e1b3773d6 100644 (file)
@@ -31,9 +31,9 @@
 #include "insets/InsetListingsParams.h"
 #include "insets/InsetInclude.h"
 
-#include <QPushButton>
 #include <QCheckBox>
 #include <QLineEdit>
+#include <QPushButton>
 
 #include <utility>