[QGIS Commit] r10893 - in trunk/qgis: python/core src/core/symbology src/plugins/grass src/providers/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-06-09 02:57:55 -0400 (Tue, 09 Jun 2009)
New Revision: 10893

Modified:
   trunk/qgis/python/core/qgssymbol.sip
   trunk/qgis/src/core/symbology/qgssymbol.h
   trunk/qgis/src/plugins/grass/CMakeLists.txt
   trunk/qgis/src/providers/grass/CMakeLists.txt
Log:
fix build problems with GRASS 6.5 GEOS support and #1723

Modified: trunk/qgis/python/core/qgssymbol.sip
===================================================================
--- trunk/qgis/python/core/qgssymbol.sip	2009-06-08 07:19:57 UTC (rev 10892)
+++ trunk/qgis/python/core/qgssymbol.sip	2009-06-09 06:57:55 UTC (rev 10893)
@@ -72,7 +72,7 @@
     /** Get QImage representation of point symbol with current settings
      * and scaled (can be slow when scale != 1.0)
      */
-    virtual QImage getPointSymbolAsImage( double widthScale = 1.,
+    virtual QImage getPointSymbolAsImage( double widthScale = 1.0,
                                           bool selected = false,
                                           QColor selectionColor = Qt::yellow,
                                           double scale = 1.0,

Modified: trunk/qgis/src/core/symbology/qgssymbol.h
===================================================================
--- trunk/qgis/src/core/symbology/qgssymbol.h	2009-06-08 07:19:57 UTC (rev 10892)
+++ trunk/qgis/src/core/symbology/qgssymbol.h	2009-06-09 06:57:55 UTC (rev 10893)
@@ -101,13 +101,13 @@
 
     /** Get QImage representation of point symbol with current settings
     */
-    virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.,
+    virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.0,
         bool selected = false, QColor selectionColor = Qt::yellow );
 
     /** Get QImage representation of point symbol with current settings
      * and scaled (can be slow when scale != 1.0)
      */
-    virtual QImage getPointSymbolAsImage( double widthScale = 1.,
+    virtual QImage getPointSymbolAsImage( double widthScale = 1.0,
                                           bool selected = false,
                                           QColor selectionColor = Qt::yellow,
                                           double scale = 1.0,

Modified: trunk/qgis/src/plugins/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/grass/CMakeLists.txt	2009-06-08 07:19:57 UTC (rev 10892)
+++ trunk/qgis/src/plugins/grass/CMakeLists.txt	2009-06-09 06:57:55 UTC (rev 10893)
@@ -142,6 +142,7 @@
      ${GRASS_INCLUDE_DIR}
      ${GDAL_INCLUDE_DIR}
      ${PROJ_INCLUDE_DIR}
+     ${GEOS_INCLUDE_DIR}
      qtermwidget
 )
 

Modified: trunk/qgis/src/providers/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/grass/CMakeLists.txt	2009-06-08 07:19:57 UTC (rev 10892)
+++ trunk/qgis/src/providers/grass/CMakeLists.txt	2009-06-09 06:57:55 UTC (rev 10893)
@@ -27,6 +27,7 @@
   ${GRASS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
+  ${GEOS_INCLUDE_DIR}
 )