The branch, properpaint, has been updated.
- Log -----------------------------------------------------------------
commit fc050565a24ee00dca1cce6fff33e037ee4e4bdc
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Sat Jan 6 20:46:06 2018 +0100
Fix compilation in monolithic mode
(cherry picked from commit 3aa10c8dbaf4813fb30d6e9487a5d50720c7affd)
diff --git a/src/frontends/qt4/GuiApplication.cpp
b/src/frontends/qt4/GuiApplication.cpp
index d575119..073ef4b 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 aa2fc65..edbf7a1 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>
-----------------------------------------------------------------------
Summary of changes:
src/frontends/qt4/GuiApplication.cpp | 1 +
src/frontends/qt4/GuiInclude.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
Repository for new features
