mirror of
https://github.com/qgis/QGIS.git
synced 2025-11-27 00:07:16 -05:00
fix build problems with GRASS 6.5 GEOS support and #1723
git-svn-id: http://svn.osgeo.org/qgis/trunk@10893 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
f3567a0113
commit
c45c93c47e
@ -72,7 +72,7 @@ class QgsSymbol
|
||||
/** 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,
|
||||
|
||||
@ -101,13 +101,13 @@ class CORE_EXPORT QgsSymbol
|
||||
|
||||
/** 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,
|
||||
|
||||
@ -142,6 +142,7 @@ INCLUDE_DIRECTORIES(
|
||||
${GRASS_INCLUDE_DIR}
|
||||
${GDAL_INCLUDE_DIR}
|
||||
${PROJ_INCLUDE_DIR}
|
||||
${GEOS_INCLUDE_DIR}
|
||||
qtermwidget
|
||||
)
|
||||
|
||||
|
||||
@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES (
|
||||
${GRASS_INCLUDE_DIR}
|
||||
${GDAL_INCLUDE_DIR}
|
||||
${PROJ_INCLUDE_DIR}
|
||||
${GEOS_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user