summaryrefslogtreecommitdiff
path: root/cad/openscad/patches/patch-src_scintillaeditor.h
diff options
context:
space:
mode:
Diffstat (limited to 'cad/openscad/patches/patch-src_scintillaeditor.h')
-rw-r--r--cad/openscad/patches/patch-src_scintillaeditor.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/cad/openscad/patches/patch-src_scintillaeditor.h b/cad/openscad/patches/patch-src_scintillaeditor.h
new file mode 100644
index 00000000000..64325bfd1c4
--- /dev/null
+++ b/cad/openscad/patches/patch-src_scintillaeditor.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_scintillaeditor.h,v 1.1 2016/09/01 19:53:36 plunky Exp $
+
+the Qt4 moc has some difficulty parsing in the boost headers. Apply
+the workaround from https://bugreports.qt.io/browse/QTBUG-22829
+
+--- src/scintillaeditor.h.orig 2015-04-05 14:01:12.000000000 +0000
++++ src/scintillaeditor.h
+@@ -11,9 +11,11 @@
+ #include "scadlexer.h"
+ #include "parsersettings.h"
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
++#endif
+
+ class EditorColorScheme
+ {