From c14909eae41883308428095758360de3a7202a0d Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 2 Oct 2015 13:13:38 +0000
Subject: Backmerge of trunk

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@820 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 812e0b84d187dd5e30a6a18c12612ebc9bf9206a
---
 src/GudhUI/gui/MainWindow.h            | 2 ++
 src/GudhUI/gui/Menu_edge_contraction.h | 2 ++
 src/GudhUI/view/Viewer.h               | 3 +++
 src/GudhUI/view/Viewer_instructor.h    | 2 ++
 4 files changed, 9 insertions(+)

(limited to 'src/GudhUI')

diff --git a/src/GudhUI/gui/MainWindow.h b/src/GudhUI/gui/MainWindow.h
index 587f1c6f..e46b72a3 100644
--- a/src/GudhUI/gui/MainWindow.h
+++ b/src/GudhUI/gui/MainWindow.h
@@ -1,6 +1,8 @@
 #ifndef MAIN_WINDOW_H
 #define MAIN_WINDOW_H
 
+// Workaround for moc-qt4 not parsing boost headers
+#include <CGAL/config.h>
 
 #include <QMainWindow>
 #include "ui_main_window.h"
diff --git a/src/GudhUI/gui/Menu_edge_contraction.h b/src/GudhUI/gui/Menu_edge_contraction.h
index e497a90f..81d37bd8 100644
--- a/src/GudhUI/gui/Menu_edge_contraction.h
+++ b/src/GudhUI/gui/Menu_edge_contraction.h
@@ -8,6 +8,8 @@
 #ifndef MENU_EDGE_CONTRACTION_H_
 #define MENU_EDGE_CONTRACTION_H_
 
+// Workaround for moc-qt4 not parsing boost headers
+#include <CGAL/config.h>
 
 #include "gui/MainWindow.h"
 #include "gui/ui_MenuEdgeContraction.h"
diff --git a/src/GudhUI/view/Viewer.h b/src/GudhUI/view/Viewer.h
index 5639aa56..00f9b245 100644
--- a/src/GudhUI/view/Viewer.h
+++ b/src/GudhUI/view/Viewer.h
@@ -1,6 +1,9 @@
 #ifndef VIEWER_H
 #define VIEWER_H
 
+// Workaround for moc-qt4 not parsing boost headers
+#include <CGAL/config.h>
+
 #include <QGLViewer/qglviewer.h>
 #include "View_parameter.h"
 #include "model/Complex_typedefs.h"
diff --git a/src/GudhUI/view/Viewer_instructor.h b/src/GudhUI/view/Viewer_instructor.h
index 9a2a236b..62b3755e 100644
--- a/src/GudhUI/view/Viewer_instructor.h
+++ b/src/GudhUI/view/Viewer_instructor.h
@@ -3,6 +3,8 @@
 
 // todo do a viewer instructor that have directely a pointer to a QGLviewer and buffer ot not triangles
 
+// Workaround for moc-qt4 not parsing boost headers
+#include <CGAL/config.h>
 
 #include <memory>
 
-- 
cgit v1.2.3