fix namespace issues for qt 4.8.2

2012-06-13 10:28:03 +00:00 · 2012-06-13 10:28:03 +00:00 · 072de78ddf
commit 072de78ddf
parent 49f219fc14
1 changed files with 16 additions and 0 deletions
--- a/geo/qgis/patches/patch-src_core_qgssearchstringparser_yy
+++ b/geo/qgis/patches/patch-src_core_qgssearchstringparser_yy
@ -0,0 +1,16 @@
+$OpenBSD: patch-src_core_qgssearchstringparser_yy,v 1.1 2012/06/13 10:28:03 espie Exp $
+--- src/core/qgssearchstringparser.yy.orig	Wed Jun 13 11:52:43 2012
+++ src/core/qgssearchstringparser.yy	Wed Jun 13 11:58:49 2012
+@@ -18,6 +18,12 @@
+  /* $Id: patch-src_core_qgssearchstringparser_yy,v 1.1 2012/06/13 10:28:03 espie Exp $ */
+  
+ %{
+// XXX
+// these conflict with scopedpointer
+// and the parser generator re-defines these as enums anyways
+#undef X
+#undef Y
+
+ #include <qglobal.h>
+ #include <QList>
+ #include <cstdlib>