Merge remote-tracking branch 'ace/boost-fixes'

10 years ago · fabcdf7a1a
parent 697ab16ec5 62acb03735
commit fabcdf7a1a
2 changed files with 4 additions and 0 deletions
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@ -9,7 +9,9 @@

 #include <OgreVector3.h>

+#ifndef Q_MOC_RUN
 #include <components/terrain/terraingrid.hpp>
+#endif

 #include "object.hpp"

--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@ -3,7 +3,9 @@

 #include <boost/shared_ptr.hpp>

+#ifndef Q_MOC_RUN
 #include <components/nifogre/ogrenifloader.hpp>
+#endif

 class QModelIndex;