From 2890d51cfb65709b47ae4e30992884205f16a894 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 9 Jan 2015 08:27:30 +0100
Subject: [PATCH] Fixed some compile errors due to a moc-bug in combination
with Boost.
See https://bugreports.qt.io/browse/QTBUG-22829
---
Applications/DataExplorer/DataView/CondFromRasterDialog.h | 2 --
Applications/DataExplorer/DataView/MeshElementRemovalDialog.h | 2 ++
Applications/DataExplorer/DataView/MshModel.h | 3 +++
Applications/DataExplorer/mainwindow.h | 3 +++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Applications/DataExplorer/DataView/CondFromRasterDialog.h b/Applications/DataExplorer/DataView/CondFromRasterDialog.h
index 0c6bbb040ff..0ea322ca1c6 100644
--- a/Applications/DataExplorer/DataView/CondFromRasterDialog.h
+++ b/Applications/DataExplorer/DataView/CondFromRasterDialog.h
@@ -18,8 +18,6 @@
#include "ui_CondFromRaster.h"
#include <QDialog>
-#include "Applications/ApplicationsLib/ProjectData.h"
-
namespace MeshLib {
class Mesh;
}
diff --git a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h
index fb9f0d0a675..2a0f532c127 100644
--- a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h
+++ b/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;
diff --git a/Applications/DataExplorer/DataView/MshModel.h b/Applications/DataExplorer/DataView/MshModel.h
index a37399cd199..55aafecedf7 100644
--- a/Applications/DataExplorer/DataView/MshModel.h
+++ b/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 {
diff --git a/Applications/DataExplorer/mainwindow.h b/Applications/DataExplorer/mainwindow.h
index 7b43ea47815..36837c99f54 100644
--- a/Applications/DataExplorer/mainwindow.h
+++ b/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"
--
GitLab