Enable compilation using GEOS 3 as well as GEOS 2.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6416 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: telwertowski

src/core/qgsgeometry.cpp

@@ -73,8 +73,8 @@ QgsGeometry::QgsGeometry( QgsGeometry const & rhs )
 
 QgsGeometry* QgsGeometry::fromWkt(QString wkt)
 {
-  geos::WKTReader reader(geosGeometryFactory);
-  geos::Geometry* geom = reader.read(wkt.toLocal8Bit().data());
+  GEOS_IO::WKTReader reader(geosGeometryFactory);
+  GEOS_GEOM::Geometry* geom = reader.read(wkt.toLocal8Bit().data());
   QgsGeometry* g = new QgsGeometry;
   g->setGeos(geom);
   return g;

src/providers/wfs/qgswfsprovider.h

@@ -22,6 +22,7 @@
 #include "qgis.h"
 #include "qgsrect.h"
 #include "qgsvectordataprovider.h"
+#include <geos.h>
 #include <indexStrtree.h>
 #if GEOS_VERSION_MAJOR < 3 
 #define GEOS_INDEX_STRTREE geos