Merge pull request #552 from bilke/boost-fix

Fixed some compile errors due to a moc-bug in combination with Boost

Applications/DataExplorer/DataView/CondFromRasterDialog.h

@@ -18,8 +18,6 @@
 #include "ui_CondFromRaster.h"
 #include <QDialog>
 
-#include "Applications/ApplicationsLib/ProjectData.h"
-
 namespace MeshLib {
 	class Mesh;
 }

Applications/DataExplorer/DataView/MeshElementRemovalDialog.h

@@ -18,7 +18,9 @@
 #include "ui_MeshElementRemoval.h"
 #include <QDialog>
 
+#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #include "Applications/ApplicationsLib/ProjectData.h"
+#endif
 
 class Node;
 

Applications/DataExplorer/DataView/MshModel.h

@@ -16,7 +16,10 @@
 #define MSHMODEL_H
 
 // ** INCLUDES **
+#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #include "Applications/ApplicationsLib/ProjectData.h"
+#endif
+
 #include "TreeModel.h"
 
 namespace MeshLib {

Applications/DataExplorer/mainwindow.h

@@ -15,7 +15,10 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #include "Applications/ApplicationsLib/ProjectData.h"
+#endif
+
 #include "ImportFileTypes.h"
 #include "ui_mainwindow.h"