Added in pre-processor check to see if signals is already defined. If so, alert the...

diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index d5d7652f1c4f37c40fac328b9f7895e9218b7550..1398971ca941ae6f1459e65dfd3daac067f95f85 100644 (file)
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -45,6 +45,13 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+#ifdef signals
+#  error \
+    "The data type signals is already defined. You are most likely using the QT library \
+and using the signals keyword. You can either #include the Qt headers (or any conflicting headers) \
+after the deal.ii headers or you can define the QT_NO_KEYWORDS marco and use the Q_SIGNALS macro."
+#endif
+
 // Forward declarations
 #ifndef DOXYGEN
 template <int dim, int spacedim>

diff --git a/include/deal.II/multigrid/multigrid.h b/include/deal.II/multigrid/multigrid.h
index d8ed117e1ba863a2e42d48a36e0520394e7f4d36..86619433939585ef43412d686df35f073dee8f4e 100644 (file)
--- a/include/deal.II/multigrid/multigrid.h
+++ b/include/deal.II/multigrid/multigrid.h
@@ -36,6 +36,13 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+#ifdef signals
+#  error \
+    "The data type signals is already defined. You are most likely using the QT library \
+and using the signals keyword. You can either #include the Qt headers (or any conflicting headers) \
+after the deal.ii headers or you can define the QT_NO_KEYWORDS marco and use the Q_SIGNALS macro."
+#endif
+
 /*!@addtogroup mg */
 /*@{*/